linuxdvb: honour the autodiscovery option

diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 7f2112b67f530937d1af01862958660f2f5b01e3..572c050075952ebdb2aea4d8dac2d06f22aed30a 100644 (file)
--- 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 1ea523cf7c0a9156284fc3d320e1fd237197b866..d02cb8db084c2b57c317adcd91b3bd4dee0c3959 100644 (file)
--- 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);