From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 13 Jan 2016 08:30:25 +0000 (+0100)
Subject: move struct source_info from tvheadend.h to service.h
X-Git-Tag: v4.2.1~1175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ed205583c2aa2c7eb226896d378e0f0c863c09f;p=thirdparty%2Ftvheadend.git

move struct source_info from tvheadend.h to service.h
---

diff --git a/src/service.h b/src/service.h
index bb6822aae..6a2454336 100644
--- a/src/service.h
+++ b/src/service.h
@@ -35,6 +35,19 @@ struct channel;
 struct tvh_input;
 struct mpegts_apids;
 
+/**
+ * Source information
+ */
+typedef struct source_info {
+  char *si_adapter;
+  char *si_network;
+  char *si_satpos;
+  char *si_mux;
+  char *si_provider;
+  char *si_service;
+  int   si_type;
+} source_info_t;
+
 /**
  * Stream, one media component for a service.
  */
diff --git a/src/streaming.h b/src/streaming.h
index e0f3916c6..07fa3537e 100644
--- a/src/streaming.h
+++ b/src/streaming.h
@@ -21,6 +21,7 @@
 
 #include "packet.h"
 #include "htsmsg.h"
+#include "service.h"
 
 
 typedef struct streaming_start_component {
diff --git a/src/tvheadend.h b/src/tvheadend.h
index 01cbf629d..85ee7694d 100644
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -96,17 +96,6 @@ extern int tvheadend_webui_port;
 extern int tvheadend_webui_debug;
 extern int tvheadend_htsp_port;
 
-typedef struct source_info {
-  char *si_adapter;
-  char *si_network;
-  char *si_satpos;
-  char *si_mux;
-  char *si_provider;
-  char *si_service;
-  int   si_type;
-} source_info_t;
-
-
 static inline void
 lock_assert0(pthread_mutex_t *l, const char *file, int line)
 {