dvb network scan: don't subscribe to already active mux, move Idle Scan to hidden...

diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c
index 2604733c980d425407d9afbf8acf688ec3060043..3ec3df7ecb10d2615bd8888f8ed32d8d3685bb71 100644 (file)
--- a/src/input/mpegts/mpegts_network.c
+++ b/src/input/mpegts/mpegts_network.c
@@ -172,7 +172,7 @@ const idclass_t mpegts_network_class =
       .off      = offsetof(mpegts_network_t, mn_idlescan),
       .def.i    = 0,
       .notify   = mpegts_network_class_idlescan_notify,
-      .opts     = PO_ADVANCED,
+      .opts     = PO_ADVANCED | PO_HIDDEN,
     },
     {
       .type     = PT_BOOL,

diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
index 93901ad1665464e8e77399aa9d8aaeed738378dc..646c80c7198472984a1e19c41f0788551f3cf580 100644 (file)
--- a/src/input/mpegts/mpegts_network_scan.c
+++ b/src/input/mpegts/mpegts_network_scan.c
@@ -49,6 +49,9 @@ mpegts_network_scan_timer_cb ( void *p )
     nxt = TAILQ_NEXT(mm, mm_scan_link);
     assert(mm->mm_scan_state == MM_SCAN_STATE_PEND);
 
+    /* Don't try to subscribe already tuned muxes */
+    if (mm->mm_active) continue;
+
     /* Attempt to tune */
     r = mpegts_mux_subscribe(mm, "scan", mm->mm_scan_weight, mm->mm_scan_flags);