From: WereCatf <werecatf@gmail.com>
Date: Tue, 5 May 2015 07:53:08 +0000 (+0300)
Subject: Tunercfg override
X-Git-Tag: v4.1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dd7fb9f5b9247241e5b96f10c2353f51f1cc4fa;p=thirdparty%2Ftvheadend.git

Tunercfg override
---

diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html
index 52826a356..f8dd79e13 100644
--- a/docs/html/config_tvadapters.html
+++ b/docs/html/config_tvadapters.html
@@ -186,7 +186,12 @@ setting this to 100.</dd>
 <p>
   <dt><b>Send full PLAY cmd</b></dt>
   <dd>Send the full RTSP PLAY command after full RTSP SETUP command. Some
-      device firmwares requires this to get MPEG-TS stream.</dd>
+      device firmwares require this to get MPEG-TS stream.</dd>
+<p>
+  <dt><b>Override tuner count</b></dt>
+  <dd>Force tvheadend to see a specific number of tuners. Some devices, notably 
+      AVM's FRITZ!Box Cable 6490, report wrong number of tuners and this setting
+      allows you to override that. Any value below 1 or above 32 is ignored.</dd>
 <p>
   <dt><b>Force teardown delay</b><dt>
   <dd>Force the delay between RTSP TEARDOWN and RTSP SETUP command (value
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
index 4306b26c4..91c2dec34 100644
--- a/src/input/mpegts/satip/satip.c
+++ b/src/input/mpegts/satip/satip.c
@@ -202,6 +202,13 @@ const idclass_t satip_device_class =
       .opts     = PO_ADVANCED,
       .off      = offsetof(satip_device_t, sd_pilot_on),
     },
+    {
+      .type     = PT_INT,
+      .id       = "tunercfgoverride",
+      .name     = "Override tuner count",
+      .opts     = PO_ADVANCED,
+      .off      = offsetof(satip_device_t, sd_tunercfg_override),
+    },
     {
       .type     = PT_STR,
       .id       = "bindaddr",
@@ -493,6 +500,7 @@ satip_device_create( satip_device_info_t *info )
       m = atoi(argv[i] + 6);
       v2 = 2;
     }
+    if (sd->sd_tunercfg_override > 0 && sd->sd_tunercfg_override < 33) m = sd->sd_tunercfg_override;
     if (type == DVB_TYPE_NONE) {
       tvhlog(LOG_ERR, "satip", "%s: bad tuner type [%s]",
              satip_device_nicename(sd, buf2, sizeof(buf2)), argv[i]);
diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
index c6044d522..104adec8c 100644
--- a/src/input/mpegts/satip/satip_private.h
+++ b/src/input/mpegts/satip/satip_private.h
@@ -84,6 +84,7 @@ struct satip_device
   int                        sd_pids_deladd;
   int                        sd_sig_scale;
   int                        sd_pids0;
+  int                        sd_tunercfg_override;
   int                        sd_fritz_quirk;
   int                        sd_pilot_on;
   int                        sd_no_univ_lnb;