Ticket #6274: HDHR-DVB.1.patch

libs/libmythtv/hdhrrecorder.h

@@ -18 +18 @@
 typedef vector<uint>        uint_vec_t;
 
 class HDHRRecorder : public DTVRecorder,
+                     public DVBMainStreamListener,
+                     public ATSCMainStreamListener,
                      public MPEGStreamListener,
                      public MPEGSingleProgramStreamListener
 {
-    friend class ATSCStreamData;
-
   public:
     HDHRRecorder(TVRec *rec, HDHRChannel *channel);
     ~HDHRRecorder();
@@ -52 +52 @@
     void HandleSingleProgramPAT(ProgramAssociationTable *pat);
     void HandleSingleProgramPMT(ProgramMapTable *pmt);
 
-    /*
     // ATSC
     void HandleSTT(const SystemTimeTable*) {}
-    void HandleMGT(const MasterGuideTable *mgt);
+    void HandleMGT(const MasterGuideTable *) {};
     void HandleVCT(uint, const VirtualChannelTable*) {}
-    */
 
+    // DVBMainStreamListener
+    void HandleTDT(const TimeDateTable*) {}
+    void HandleNIT(const NetworkInformationTable*) {}
+    void HandleSDT(uint /*tsid*/, const ServiceDescriptionTable*) {}
+
   private:
     bool AdjustFilters(void);
     bool AdjustEITPIDs(void);

libs/libmythtv/hdhrrecorder.cpp

@@ -27 +27 @@
 #include "hdhrrecorder.h"
 #include "atsctables.h"
 #include "atscstreamdata.h"
+#include "dvbstreamdata.h"
 #include "eithelper.h"
 #include "tv_rec.h"
 
@@ -176 +177 @@
         data->AddMPEGListener(this);
 
         ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data);
+        DVBStreamData  *dvb  = dynamic_cast<DVBStreamData*>(data);
 
         if (atsc && atsc->DesiredMinorChannel())
             atsc->SetDesiredChannel(atsc->DesiredMajorChannel(),
                                     atsc->DesiredMinorChannel());
+        else if (dvb)
+            dvb->AddDVBMainListener(this);
         else if (data->DesiredProgram() >= 0)
             data->SetDesiredProgram(data->DesiredProgram());
     }