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 6f25b260d4e053d5ca8a001ec67d30ce63183cb6..41df6645ab33e169408036dba06d8f3f93a9d5da 100644 (file)
--- 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 abd6f7906ba7a31666301f302b84c979d280afff..a6b7d647cf887b5ec9f5cdfc0fb3c477711467a9 100644 (file)
--- 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 b6858f4feb46022cc0b252ea1b984707cef893e3..f726013c34bbe8c34c564883a6ad7ddf232db231 100644 (file)
--- 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 bb1a87124fe1237f7434c05008e4a42aef8ef24d..6d091c526f2be72990a54134855fdaa87963a1da 100644 (file)
--- 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"