Ticket #2541: hdhr-qam256.diff

libs/libmythtv/hdhrchannel.cpp

@@ -389 +389 @@
     if (atsc_major || atsc_minor)
         SetCachedATSCInfo(QString("%1_%2").arg(atsc_major).arg(atsc_minor));
     else
-        SetCachedATSCInfo(QString("%1_0").arg(channum));
+        SetCachedATSCInfo(QString("0-%1").arg(mpeg_prog_num));
 
     // Set this as the future start channel for this source
     inputs[currentInputID]->startChanNum = curchannelname;

libs/libmythtv/hdhrrecorder.cpp

@@ -151 +151 @@
     }
 }
 
-void HDHRRecorder::SetStreamData(MPEGStreamData *xdata)
+void HDHRRecorder::SetStreamData(MPEGStreamData *data)
 {
-    ATSCStreamData *data = dynamic_cast<ATSCStreamData*>(xdata);
-    VERBOSE(VB_IMPORTANT, LOC + "SetStreamData(xdata: "<<xdata<<") "<<data);
-
     if (data == _stream_data)
         return;
 
-    ATSCStreamData *old_data = _stream_data;
+    MPEGStreamData *old_data = _stream_data;
     _stream_data = data;
     if (old_data)
         delete old_data;
@@ -168 +165 @@
     {
         data->AddMPEGSPListener(this);
         data->AddMPEGListener(this);
-        data->SetDesiredChannel(data->DesiredMajorChannel(),
-                                data->DesiredMinorChannel());
+
+        ATSCStreamData *atsc = GetATSCStreamData();
+        if (atsc)
+            atsc->SetDesiredChannel(atsc->DesiredMajorChannel(),
+                                atsc->DesiredMinorChannel());
     }
 }
 
-MPEGStreamData *HDHRRecorder::GetStreamData(void)
+ATSCStreamData *HDHRRecorder::GetATSCStreamData(void)
 {
-    return _stream_data;
+    return dynamic_cast<ATSCStreamData*>(_stream_data);
 }
 
 void HDHRRecorder::HandlePAT(const ProgramAssociationTable *_pat)
@@ -319 +319 @@
         return;
     }
 
+    if (_stream_data->PATSingleProgram())
+        HandlePAT(_stream_data->PATSingleProgram());
+    if (_stream_data->PMTSingleProgram())
+        HandlePMT(_stream_data->DesiredProgram(), 
+                  _stream_data->PMTSingleProgram());
+
     hdhomerun_video_flush(_video_socket);
     while (_request_recording && !_error)
     {

libs/libmythtv/hdhrrecorder.h

@@ -39 +39 @@
     void StartRecording(void);
 
     void SetStreamData(MPEGStreamData*);
-    MPEGStreamData *GetStreamData(void);
-    ATSCStreamData *GetATSCStreamData(void) { return _stream_data; }
+    MPEGStreamData *GetStreamData(void) { return _stream_data; }
+    ATSCStreamData *GetATSCStreamData(void);
 
     // MPEG Stream Listener
     void HandlePAT(const ProgramAssociationTable*);
@@ -69 +69 @@
   private:
     HDHRChannel                   *_channel;
     struct hdhomerun_video_sock_t *_video_socket;
-    ATSCStreamData                *_stream_data;
+    MPEGStreamData                *_stream_data;
 
     ProgramAssociationTable       *_input_pat;
     ProgramMapTable               *_input_pmt;