Ticket #1573: eit_1.diff

mythtv/libs/libmythtv/tv_rec.cpp

@@ -78 +78 @@
 #define LOC QString("TVRec(%1): ").arg(cardid)
 #define LOC_ERR QString("TVRec(%1) Error: ").arg(cardid)
 
-/// How many seconds after entering kState_None should we start EIT Scanner
-const uint TVRec::kEITScanStartTimeout = 60; /* 1 minute */
-
 /// How many milliseconds the signal monitor should wait between checks
 const uint TVRec::kSignalMonitoringRate = 50; /* msec */
 
@@ -773 +770 @@
     {
         // Add some randomness to avoid all cards starting
         // EIT scanning at nearly the same time.
-        uint timeout = kEITScanStartTimeout + random() % 59;
+        uint idle_start = gContext->GetNumSetting("EITCrawIdleStart", 1);
+        uint timeout = (idle_start * 60) + random() % 59;
         eitScanStartTime = eitScanStartTime.addSecs(timeout);
     }
     else
@@ -1212 +1210 @@
 
     // Add some randomness to avoid all cards starting
     // EIT scanning at nearly the same time.
-    uint timeout = kEITScanStartTimeout + random() % 59;
+    uint idle_start = gContext->GetNumSetting("EITCrawIdleStart", 1);
+    uint timeout = (idle_start * 60) + random() % 59;
     eitScanStartTime = QDateTime::currentDateTime().addSecs(timeout);
 
     while (HasFlags(kFlagRunMainLoop))

mythtv/libs/libmythtv/tv_rec.h

@@ -408 +408 @@
     int retune_requests;
 
   public:
-    static const uint kEITScanStartTimeout;
     static const uint kSignalMonitoringRate;
 
     // General State flags

mythtv/setup/backendsettings.cpp

@@ -252 +252 @@
     return gc;
 };
 
+static GlobalSpinBox *EITCrawIdleStart()
+{
+    GlobalSpinBox *gc = new GlobalSpinBox("EITCrawIdleStart", 1, 120, 1);
+    gc->setLabel(QObject::tr("Backend Idle Before EIT Craw (mins)"));
+    gc->setValue(1);
+    QString help = QObject::tr(
+        "The amount of idle time, in minutes, to wait before listings "
+        "data is collected.");
+    gc->setHelpText(help);
+    return gc;
+}
 
 static GlobalSpinBox *WOLbackendReconnectWaitTime()
 {
@@ -670 +681 @@
     group2a1->setLabel(QObject::tr("EIT Scanner Options"));                
     group2a1->addChild(EITTransportTimeout());
     group2a1->addChild(EITIgnoresSource());
+    group2a1->addChild(EITCrawIdleStart());
     addChild(group2a1);
 
     VerticalConfigurationGroup* group3 = new VerticalConfigurationGroup(false);