From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 8 Mar 2018 15:14:10 +0000 (+0100)
Subject: split hbbtv desclarations from tsdemux.h to dvb_psi_hbbtv.h
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9418f085f46414973243c5e6337fbf68e3bf97e0;p=thirdparty%2Ftvheadend.git

split hbbtv desclarations from tsdemux.h to dvb_psi_hbbtv.h
---

diff --git a/src/input/mpegts/dvb_psi_hbbtv.c b/src/input/mpegts/dvb_psi_hbbtv.c
index 6f25b260d..41df6645a 100644
--- a/src/input/mpegts/dvb_psi_hbbtv.c
+++ b/src/input/mpegts/dvb_psi_hbbtv.c
@@ -18,9 +18,7 @@
 
 #include "tvheadend.h"
 #include "service.h"
-#include "tsdemux.h"
-#include "htsmsg.h"
-#include "htsmsg_binary.h"
+#include "dvb_psi_hbbtv.h"
 
 /**
  * Extract Hbbtv
diff --git a/src/input/mpegts/tsdemux.c b/src/input/mpegts/tsdemux.c
index abd6f7906..a6b7d647c 100644
--- a/src/input/mpegts/tsdemux.c
+++ b/src/input/mpegts/tsdemux.c
@@ -20,6 +20,7 @@
 #include "subscriptions.h"
 #include "streaming.h"
 #include "input.h"
+#include "dvb_psi_hbbtv.h"
 #include "tsdemux.h"
 
 #define TS_REMUX_BUFSIZE (188 * 100)
diff --git a/src/input/mpegts/tsdemux.h b/src/input/mpegts/tsdemux.h
index b6858f4fe..f726013c3 100644
--- a/src/input/mpegts/tsdemux.h
+++ b/src/input/mpegts/tsdemux.h
@@ -33,9 +33,4 @@ void ts_skip_packet2(struct mpegts_service *t, const uint8_t *tsb, int len);
 
 void ts_recv_raw(struct mpegts_service *t, const uint8_t *tsb, int len);
 
-htsmsg_t *ts_recv_hbbtv(struct mpegts_psi_table *mt, elementary_stream_t *st,
-                        const uint8_t *buf, int len, int *_sect);
-
-void ts_recv_hbbtv_cb(mpegts_psi_table_t *mt, const uint8_t *buf, int len);
-
 #endif /* TSDEMUX_H */
diff --git a/src/parsers/message.c b/src/parsers/message.c
index bb1a87124..6d091c526 100644
--- a/src/parsers/message.c
+++ b/src/parsers/message.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "parsers.h"
-#include "../input/mpegts/tsdemux.h"
+#include "../input/mpegts/dvb_psi_hbbtv.h"
 #include "packet.h"
 #include "streaming.h"
 #include "config.h"