Ticket #2741: disable_active_eitscan.diff

libs/libmythtv/dbcheck.cpp

@@ -13 +13 @@
 #define MINIMUM_DBMS_VERSION 5
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1208";
+const QString currentDatabaseVersion = "1209";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -3407 +3407 @@
             return false;
     }
 
+    if (dbver == "1208")
+    {
+        const QString updates[] = {
+"ALTER TABLE capturecard ADD dvb_eitscan tinyint(1) NOT NULL default '1'; ",
+""
+};
+        if (!performActualUpdate(updates, "1209", dbver))
+            return false;
+    }
+
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22

libs/libmythtv/tv_rec.cpp

@@ -1447 +1447 @@
         if (channel && scanner &&
             QDateTime::currentDateTime() > eitScanStartTime)
         {
-            if (!get_use_eit(GetCaptureCardNum()))
+            if (!dvbOpt.dvb_eitscan)
+            {
+                VERBOSE(VB_EIT, LOC + "EIT scanning disabled for this card.");
+                eitScanStartTime = eitScanStartTime.addYears(1);
+            }
+            else if (!get_use_eit(GetCaptureCardNum()))
             {
                 VERBOSE(VB_EIT, LOC + "EIT scanning disabled "
                         "for all sources on this card.");
@@ -1590 +1595 @@
         "       skipbtaudio,      signal_timeout,      channel_timeout, "
         "       dvb_wait_for_seqstart, "
         ""
-        "       dvb_on_demand,    dvb_tuning_delay, "
+        "       dvb_on_demand,    dvb_tuning_delay,    dvb_eitscan"
         ""
         "       firewire_speed,   firewire_model,      firewire_connection, "
         ""
@@ -1649 +1654 @@
     uint dvboff = 10;
     dvb_opts.dvb_on_demand    = query.value(dvboff + 0).toUInt();
     dvb_opts.dvb_tuning_delay = query.value(dvboff + 1).toUInt();
+    dvb_opts.dvb_eitscan      = query.value(dvboff + 2).toUInt();
 
     // Firewire options
-    uint fireoff = dvboff + 2;
+    uint fireoff = dvboff + 3;
     firewire_opts.speed       = query.value(fireoff + 0).toUInt();
 
     test = query.value(fireoff + 1).toString();

libs/libmythtv/tv_rec.h

@@ -79 +79 @@
 class DVBDBOptions
 {
   public:
-    DVBDBOptions() : dvb_on_demand(false), dvb_tuning_delay(0) {;}
+    DVBDBOptions() : dvb_on_demand(false), dvb_tuning_delay(0), dvb_eitscan(true) {;}
     bool dvb_on_demand;
     uint dvb_tuning_delay;
+    bool dvb_eitscan;
 };
 
 class FireWireDBOptions

libs/libmythtv/videosource.cpp

@@ -1052 +1052 @@
     };
 };
 
+class DVBEITScan : public CheckBoxSetting, public CaptureCardDBStorage
+{
+  public:
+    DVBEITScan(const CaptureCard &parent) :
+        CheckBoxSetting(this),
+        CaptureCardDBStorage(this, parent, "dvb_eitscan")
+    {
+        setLabel(QObject::tr("Use DVB Card for active EIT scan"));
+        setValue(true);
+        setHelpText(
+            QObject::tr("This option activates the active scan for "
+                        "program data (EIT). With this option enabled "
+                        "the DVB card is constantly in-use."));
+    };
+};
+
 class DVBTuningDelay : public SpinBoxSetting, public CaptureCardDBStorage
 {
   public:
@@ -2952 +2968 @@
     rec->addChild(count);
     rec->addChild(new DVBNoSeqStart(parent));
     rec->addChild(new DVBOnDemand(parent));
+    rec->addChild(new DVBEITScan(parent));
     rec->addChild(new DVBTuningDelay(parent));
 
     addChild(rec);

libs/libmythtv/cardutil.cpp

@@ -468 +468 @@
         "SELECT videodevice,           cardtype,       defaultinput,     "
         "       hostname,              signal_timeout, channel_timeout,  "
         "       dvb_wait_for_seqstart, dvb_on_demand,  dvb_tuning_delay, "
-        "       dvb_diseqc_type,       diseqcid "
+        "       dvb_diseqc_type,       diseqcid,       dvb_eitscan "
         "FROM capturecard "
         "WHERE cardid = :CARDID");
     query.bindValue(":CARDID", src_cardid);
@@ -497 +497 @@
         "    dvb_on_demand         = :V7, "
         "    dvb_tuning_delay      = :V8, "
         "    dvb_diseqc_type       = :V9, "
-        "    diseqcid              = :V10 "
+        "    diseqcid              = :V10,"
+        "    dvb_eitscan           = :V11 "
         "WHERE cardid = :CARDID");
-    for (uint i = 0; i < 11; i++)
+    for (uint i = 0; i < 12; i++)
         query2.bindValue(QString(":V%1").arg(i), query.value(i).toString());
     query2.bindValue(":CARDID", dst_cardid);