Ticket #3031: 3031-v3.patch

libs/libmythtv/mpeg/atscstreamdata.cpp

@@ -107 +107 @@
 
 void ATSCStreamData::Reset(int desiredProgram)
 {
-    Reset(-1,-1);
     MPEGStreamData::Reset(desiredProgram);
     AddListeningPID(ATSC_PSIP_PID);
 }

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -74 +74 @@
     virtual ~MPEGStreamData();
 
     void SetCaching(bool cacheTables) { _cache_tables = cacheTables; }
+    virtual void Reset(void) { Reset(-1); }
     virtual void Reset(int desiredProgram);
 
     /// \brief Current Offset from computer time to DVB time in seconds

libs/libmythtv/tv_rec.cpp

@@ -1688 +1688 @@
                 GetDTVRecorder()->SetStreamData(asd);
         }
 
-        asd->Reset(major, minor);
+        asd->Reset();
         sm->SetStreamData(sd);
         sm->SetChannel(major, minor);
         sd->SetVideoStreamsRequired(neededVideo);
@@ -1730 +1730 @@
         if (GetDVBChannel())
             sd->SetIgnoreCRC(GetDVBChannel()->HasCRCBug());
 
-        dsd->Reset(netid, tsid, progNum);
+        dsd->Reset();
         sm->SetStreamData(sd);
         sm->SetDVBService(netid, tsid, progNum);
         sd->SetVideoStreamsRequired(neededVideo);
@@ -1768 +1768 @@
             sd->SetIgnoreCRC(GetDVBChannel()->HasCRCBug());
 #endif // USING_DVB
 
-        sd->Reset(progNum);
+        sd->Reset();
         sm->SetStreamData(sd);
         sm->SetProgramNumber(progNum);
         sd->SetVideoStreamsRequired(neededVideo);