Ticket #424: pmt-tostring-fix.diff

libs/libmythtv/mpeg/mpegtables.cpp

@@ -301 +301 @@
         .arg(Version()).arg(tsheader()->PID(), 0, 16)
         .arg(ProgramNumber());
 
-    if (0 != ProgramInfoLength())
+    if (0 != StreamCount())
     {
         vector<const unsigned char*> desc = 
             MPEGDescriptor::Parse(ProgramInfo(), ProgramInfoLength());

libs/libmythtv/dtvsignalmonitor.cpp

@@ -241 +241 @@
         hasAudio += pmt->IsAudio(i);
     }
 
-    if (hasVideo && hasAudio)
+    if ((hasVideo && hasAudio) ||
+        (GetStreamData()->GetVideoStreamsRequired() == 0))
         AddFlags(kDTVSigMon_PMTMatch);
 }
 

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -251 +251 @@
         AddWritingPID(pmt.PCRPID());
     }
 
-    // Misc
-    uint programNumber = 1;
-
     // Construct
     ProgramMapTable *pmt2 = ProgramMapTable::
-        Create(programNumber, _pid_pmt_single_program,
+        Create(pmt.ProgramNumber(), _pid_pmt_single_program,
                pmt.PCRPID(), pmt.Version(), pids, types);
 
     // Set Continuity Header

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -91 +91 @@
     inline void SetPMTSingleProgram(ProgramMapTable*);
     void SetVideoStreamsRequired(uint num)
         { _pmt_single_program_num_video = num; }
+    uint GetVideoStreamsRequired()          { return _pmt_single_program_num_video; }
 
     // Single program stuff, gets
     int DesiredProgram(void) const          { return _desired_program; }