Ticket #743: Changeset8551-revert.diff

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -29 +29 @@
     AddListeningPID(MPEG_PAT_PID);
 
     _pid_video_single_program = _pid_pmt_single_program = 0xffffffff;
-    _unexpected_pat_timeout = QDateTime::currentDateTime().addYears(1);
 }
 
 MPEGStreamData::~MPEGStreamData()
@@ -215 +214 @@
     VERBOSE(VB_RECORD, QString("desired_program(%1) pid(0x%2)").
             arg(_desired_program).arg(_pid_pmt_single_program, 0, 16));
 
-    QDateTime now = QDateTime::currentDateTime();
-    if (!_pid_pmt_single_program && (_unexpected_pat_timeout < now))
+    if (!_pid_pmt_single_program)
     {
         _pid_pmt_single_program = pat.FindAnyPID();
         if (!_pid_pmt_single_program)
@@ -230 +228 @@
                         "\n\t\t\tCan Not create single program PAT.")
                 .arg(_desired_program));
         SetPATSingleProgram(NULL);
-        _unexpected_pat_timeout = now.addYears(1);
-        return false;
-    }
-    else if (!_pid_pmt_single_program)
-    {
-        if (_unexpected_pat_timeout > now.addMonths(6))
-            _unexpected_pat_timeout = now.addSecs(2);
         return false;
     }
 

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -177 +177 @@
     uint                      _pmt_single_program_num_audio;
     ProgramAssociationTable  *_pat_single_program;
     ProgramMapTable          *_pmt_single_program;
-    QDateTime                 _unexpected_pat_timeout;
 };
 
 #include "mpegtables.h"