From 0f7848cc009ba2b4cf0e2b1bd8d637665da8eac9 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Wed, 18 Sep 2013 14:09:32 +0100 Subject: [PATCH] linuxdvb: honour the autodiscovery option --- src/input/mpegts/iptv/iptv.c | 8 -------- src/input/mpegts/linuxdvb/linuxdvb_network.c | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c index 7f2112b6..572c0500 100644 --- a/src/input/mpegts/iptv/iptv.c +++ b/src/input/mpegts/iptv/iptv.c @@ -470,13 +470,6 @@ const idclass_t iptv_network_class = { } }; -static mpegts_mux_t * -iptv_network_create_mux - ( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *conf ) -{ - return NULL; -} - static mpegts_mux_t * iptv_network_create_mux2 ( mpegts_network_t *mm, htsmsg_t *conf ) @@ -525,7 +518,6 @@ void iptv_init ( void ) /* Init Network */ mpegts_network_create0((mpegts_network_t*)&iptv_network, &iptv_network_class, NULL, "IPTV Network", NULL); - iptv_network.mn_create_mux = iptv_network_create_mux; iptv_network.mn_create_service = iptv_network_create_service; iptv_network.mn_mux_class = iptv_network_mux_class; iptv_network.mn_mux_create2 = iptv_network_create_mux2; diff --git a/src/input/mpegts/linuxdvb/linuxdvb_network.c b/src/input/mpegts/linuxdvb/linuxdvb_network.c index 1ea523cf..d02cb8db 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_network.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_network.c @@ -135,10 +135,9 @@ static mpegts_mux_t * linuxdvb_network_create_mux ( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *dmc ) { - // TODO: should we have a mux_find wrapper? linuxdvb_network_t *ln = (linuxdvb_network_t*)mm->mm_network; mm = linuxdvb_network_find_mux(ln, dmc); - if (!mm) { + if (!mm && ln->mn_autodiscovery) { mm = (mpegts_mux_t*)linuxdvb_mux_create0(ln, onid, tsid, dmc, NULL, NULL); if (mm) mm->mm_config_save(mm);