Ticket #743: Changeset8551-revert.diff

File Changeset8551-revert.diff, 1.9 KB (added by Stuart Auchterlonie, 15 years ago)

Reverts Changeset 8511

  • libs/libmythtv/mpeg/mpegstreamdata.cpp

    old new  
    2929    AddListeningPID(MPEG_PAT_PID);
    3030
    3131    _pid_video_single_program = _pid_pmt_single_program = 0xffffffff;
    32     _unexpected_pat_timeout = QDateTime::currentDateTime().addYears(1);
    3332}
    3433
    3534MPEGStreamData::~MPEGStreamData()
     
    215214    VERBOSE(VB_RECORD, QString("desired_program(%1) pid(0x%2)").
    216215            arg(_desired_program).arg(_pid_pmt_single_program, 0, 16));
    217216
    218     QDateTime now = QDateTime::currentDateTime();
    219     if (!_pid_pmt_single_program && (_unexpected_pat_timeout < now))
     217    if (!_pid_pmt_single_program)
    220218    {
    221219        _pid_pmt_single_program = pat.FindAnyPID();
    222220        if (!_pid_pmt_single_program)
     
    230228                        "\n\t\t\tCan Not create single program PAT.")
    231229                .arg(_desired_program));
    232230        SetPATSingleProgram(NULL);
    233         _unexpected_pat_timeout = now.addYears(1);
    234         return false;
    235     }
    236     else if (!_pid_pmt_single_program)
    237     {
    238         if (_unexpected_pat_timeout > now.addMonths(6))
    239             _unexpected_pat_timeout = now.addSecs(2);
    240231        return false;
    241232    }
    242233
  • libs/libmythtv/mpeg/mpegstreamdata.h

    old new  
    177177    uint                      _pmt_single_program_num_audio;
    178178    ProgramAssociationTable  *_pat_single_program;
    179179    ProgramMapTable          *_pmt_single_program;
    180     QDateTime                 _unexpected_pat_timeout;
    181180};
    182181
    183182#include "mpegtables.h"