SAT>IP client: remove useless All tuners option (network limit is eno…

…ugh)
tvheadend · Mar 21, 2016 · 7cb9ac2 · 7cb9ac2
1 parent 47a7808
commit 7cb9ac2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
@@ -331,14 +331,6 @@ const idclass_t satip_device_class =
       .opts     = PO_EXPERT,
       .off      = offsetof(satip_device_t, sd_skip_ts),
     },
-    {
-      .type     = PT_BOOL,
-      .id       = "all_tuners",
-      .name     = N_("All tuners (limited networks)"),
-      .desc     = N_("Try to use all tuners for the limited networks mode."),
-      .opts     = PO_EXPERT,
-      .off      = offsetof(satip_device_t, sd_all_tuners),
-    },
     {
       .type     = PT_BOOL,
       .id       = "disableworkarounds",

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
@@ -514,31 +514,18 @@ satip_frontend_is_enabled
 {
   satip_frontend_t *lfe = (satip_frontend_t*)mi;
   satip_frontend_t *lfe2;
-  int position, netlimit;
+  int position;
 
   lock_assert(&global_lock);
 
   if (!mpegts_input_is_enabled(mi, mm, flags, weight)) return 0;
   if (lfe->sf_device->sd_dbus_allow <= 0) return 0;
   if (lfe->sf_type != DVB_TYPE_S) return 1;
-  /* try to reuse any input for limited networks if allowed */
-  if (lfe->sf_device->sd_all_tuners) {
-    position = satip_satconf_get_position(lfe, mm, &netlimit, 0, 0, -1);
-    if (position <= 0) return 0;
-    if (netlimit <= 0) goto cont;
-    /* try to reuse any tuner input as slave */
-    TAILQ_FOREACH(lfe2, &lfe->sf_device->sd_frontends, sf_link) {
-      if (lfe2 == lfe) continue;
-      if (satip_frontend_match_satcfg(lfe2, mm, flags, weight))
-        return 1;
-    }
-  }
   /* check if the position is enabled */
   position = satip_satconf_get_position(lfe, mm, NULL, 1, flags, weight);
   if (position <= 0)
     return 0;
   /* check if any "blocking" tuner is running */
-cont:
   TAILQ_FOREACH(lfe2, &lfe->sf_device->sd_frontends, sf_link) {
     if (lfe2 == lfe) continue;
     if (lfe2->sf_type != DVB_TYPE_S) continue;

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
@@ -95,7 +95,6 @@ struct satip_device
   int                        sd_can_weight;
   int                        sd_dbus_allow;
   int                        sd_skip_ts;
-  int                        sd_all_tuners;
   int                        sd_disable_workarounds;
   pthread_mutex_t            sd_tune_mutex;
 };