Ticket #1728: 01_disable_active_eitscan.diff

libs/libmythtv/eitscanner.h

@@ -34 +34 @@
     void StartPassiveScan(ChannelBase*, EITSource*, bool ignore_source);
     void StopPassiveScan(void);
 
+#if 0
     void StartActiveScan(TVRec*, uint max_seconds_per_source,
                          bool ignore_source);
 
     void StopActiveScan(void);        
+#endif
 
   private:
     void TeardownAll(void);
@@ -56 +58 @@
 
     TVRec           *rec;
     bool             activeScan;
+#if 0
     QDateTime        activeScanNextTrig;
     uint             activeScanTrigTime;
     QStringList      activeScanChannels;
     QStringList::iterator activeScanNextChan;
+#endif 
 
     bool             ignore_source;
 

libs/libmythtv/tv_rec.cpp

@@ -726 +726 @@
     // to avoid race condition with it's tuning requests.
     if (HasFlags(kFlagEITScannerRunning))
     {
-        scanner->StopActiveScan();
+        scanner->StopPassiveScan();
         ClearFlags(kFlagEITScannerRunning);
     }
 
@@ -1380 +1380 @@
                         "for all sources on this card.");
                 eitScanStartTime = eitScanStartTime.addYears(1);
             }
+/*
             else
             {
                 uint ttMin = gContext->GetNumSetting("EITTransportTimeout", 5);
@@ -1388 +1389 @@
                 SetFlags(kFlagEITScannerRunning);
                 eitScanStartTime = QDateTime::currentDateTime().addYears(1);
             }
+*/
         }
 
         // We should be no more than a few thousand milliseconds,
@@ -3540 +3542 @@
 
     if (!(request.flags & kFlagEITScan) && HasFlags(kFlagEITScannerRunning))
     {
-        scanner->StopActiveScan();
+        scanner->StopPassiveScan();
         ClearFlags(kFlagEITScannerRunning);
     }
 

libs/libmythtv/eitscanner.cpp

@@ -41 +41 @@
 
 void EITScanner::TeardownAll(void)
 {
-    StopActiveScan();
+    StopPassiveScan();
     if (!exitThread)
     {
         exitThread = true;
@@ -114 +114 @@
             RescheduleRecordings();
         }
 
+#if 0
         if (activeScan && (QDateTime::currentDateTime() > activeScanNextTrig))
         {
             // if there have been any new events, tell scheduler to run.
@@ -140 +141 @@
                 .addSecs(activeScanTrigTime);
             activeScanNextChan++;
         }
+#endif
 
         exitThreadCond.wait(200); // sleep up to 200 ms.
     }
@@ -209 +211 @@
     eitHelper->SetSourceID(0);
 }
 
+#if 0
 void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source,
                                  bool _ignore_source)
 {
@@ -272 +275 @@
     rec = NULL;
     StopPassiveScan();
 }
+#endif