Ticket #1728: 03_make_eitcache_persistant.diff

libs/libmythtv/eithelper.cpp

@@ -26 +26 @@
 #define LOC QString("EITHelper: ")
 #define LOC_ERR QString("EITHelper, Error: ")
 
-EITHelper::EITHelper() :
-    eitfixup(new EITFixUp()), eitcache(new EITCache()),
+EITHelper::EITHelper(EITCache *cache) :
+    eitfixup(new EITFixUp()), eitcache(cache),
     gps_offset(-1 * GPS_LEAP_SECONDS),          utc_offset(0),
     sourceid(0)
 {

libs/libmythtv/eithelper.h

@@ -51 +51 @@
 class EITHelper
 {
   public:
-    EITHelper();
+    EITHelper(EITCache *cache);
     virtual ~EITHelper();
 
     uint GetListSize(void) const;

libs/libmythtv/eitscanner.h

@@ -17 +17 @@
 class EITHelper;
 class dvb_channel_t;
 class ProgramMapTable;
+class EITCache;
 
 class EITSource
 {
@@ -28 +29 @@
 class EITScanner
 {
   public:
-    EITScanner();
+    EITScanner(EITCache *cache);
     ~EITScanner() { TeardownAll(); }
 
     void StartPassiveScan(ChannelBase*, EITSource*, bool ignore_source);

libs/libmythtv/tv_rec.cpp

@@ -117 +117 @@
        // Various components TVRec coordinates
     : recorder(NULL), channel(NULL), signalMonitor(NULL),
       scanner(NULL), dvbsiparser(NULL), dummyRecorder(NULL),
+      eitcache(NULL),
       // Configuration variables from database
       transcodeFirst(false), earlyCommFlag(false), runJobOnHostOnly(false),
       audioSampleRateDB(0), overRecordSecNrml(0), overRecordSecCat(0),
@@ -151 +152 @@
     bool init_run = false;
     if (genOpt.cardtype == "DVB")
     {
-        if (!scanner)
-            scanner = new EITScanner();
+        if (!scanner && eitcache)
+            scanner = new EITScanner(eitcache);
 
 #ifdef USING_DVB
         channel = new DVBChannel(genOpt.videodev.toInt(), this);
@@ -904 +905 @@
 #ifdef USING_HDHOMERUN
         HDHRChannel  *hdhr_channel  = GetHDHRChannel();
         HDHRRecorder *hdhr_recorder = GetHDHRRecorder();
-        if (hdhr_channel && hdhr_recorder && !scanner)
+        if (hdhr_channel && hdhr_recorder && !scanner && eitcache)
         {
             uint ignore = gContext->GetNumSetting("EITIgnoresSource", 0);
-            scanner = new EITScanner();
+            scanner = new EITScanner(eitcache);
             scanner->StartPassiveScan(hdhr_channel, hdhr_recorder, ignore);
         }
 #endif // USING_HDHOMERUN

libs/libmythtv/eitscanner.cpp

@@ -25 +25 @@
 QDateTime  EITScanner::resched_next_time      = QDateTime::currentDateTime();
 const uint EITScanner::kMinRescheduleInterval = 150;
 
-EITScanner::EITScanner()
-    : channel(NULL), eitSource(NULL), eitHelper(new EITHelper()),
+EITScanner::EITScanner(EITCache *cache)
+    : channel(NULL), eitSource(NULL), eitHelper(new EITHelper(cache)),
       exitThread(false), rec(NULL), activeScan(false)
 {
     QStringList langPref = iso639_get_language_list();

libs/libmythtv/tv_rec.h

@@ -20 +20 @@
 class QSocket;
 class NuppelVideoRecorder;
 class RingBuffer;
+class EITCache;
 class EITScanner;
 class DVBSIParser;
 class DummyDTVRecorder;
@@ -256 +257 @@
     void DVBGotPMT(void)
         { QMutexLocker lock(&stateChangeLock); triggerEventLoop.wakeAll(); }
 
+    void SetEITCache(EITCache *cache) { eitcache = cache; }
+
   public slots:
     void SignalMonitorAllGood() { triggerEventLoop.wakeAll(); }
     void deleteLater(void);
@@ -342 +345 @@
     RecorderBase     *recorder;
     ChannelBase      *channel;
     SignalMonitor    *signalMonitor;
+    EITCache         *eitcache;
     EITScanner       *scanner;
     DVBSIParser      *dvbsiparser;
     DummyDTVRecorder *dummyRecorder;

programs/mythbackend/eitactivescanner.cpp

@@ -47 +47 @@
 {
     exitThread = false;
 
-//     QMap<int, EncoderLink *>::iterator it = cardList->begin();
-//     for (; it != cardList->end(); ++it)
-//     {
-//         TVRec *rec = it.data()->GetTVRec();
-//         if (rec)
-//         {
-//             rec->SetEITCache(eitCache);
-//         }
-//     }
+    QMap<int, EncoderLink *>::iterator it = cardList->begin();
+    for (; it != cardList->end(); ++it)
+    {
+        TVRec *rec = it.data()->GetTVRec();
+        if (rec)
+        {
+            rec->SetEITCache(eitCache);
+        }
+    }
 //    if (ismaster)
         StartActiveScan();
 
@@ -66 +66 @@
         if (ismaster && (QDateTime::currentDateTime() > activeScanNextTrig)
             && !cardList->isEmpty())
         {
-//             cerr << eitCache->GetStatistics() << endl;
+            cerr << eitCache->GetStatistics() << endl;
             if (activeScanNextCard == cardIDToSourceID.end())
             {
                 activeScanNextCard = cardIDToSourceID.begin();