Ticket #3031: 3031-dbg-6.patch
File 3031-dbg-6.patch, 6.1 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/mpeg/mpegstreamdata.cpp
76 76 77 77 MPEGStreamData::~MPEGStreamData() 78 78 { 79 Reset(-1 );79 Reset(-1, "~MPEGStreamData()"); 80 80 SetPATSingleProgram(NULL); 81 81 SetPMTSingleProgram(NULL); 82 82 … … 120 120 ReturnCachedPATTables(pats); 121 121 122 122 if (reset) 123 Reset(p );123 Reset(p, "SetDesiredProgram(int)"); 124 124 } 125 125 126 126 void MPEGStreamData::SetEITHelper(EITHelper *eit_helper) … … 135 135 _eit_rate = rate; 136 136 } 137 137 138 void MPEGStreamData::Reset(int desiredProgram )138 void MPEGStreamData::Reset(int desiredProgram, const QString &where) 139 139 { 140 VERBOSE(VB_IMPORTANT, 141 QString("MPEGStreamData::Reset(int) called from %1").arg(where)); 142 140 143 _desired_program = desiredProgram; 141 144 _invalid_pat_seen = false; 142 145 -
libs/libmythtv/mpeg/atscstreamdata.cpp
44 44 45 45 ATSCStreamData::~ATSCStreamData() 46 46 { 47 Reset(-1,-1 );47 Reset(-1,-1, "~ATSCStreamData"); 48 48 49 49 QMutexLocker locker(&_listener_lock); 50 50 _atsc_main_listeners.clear(); … … 102 102 ReturnCachedCVCTTables(cvcts); 103 103 104 104 if (reset) 105 Reset(major, minor );105 Reset(major, minor, "ATSCStreamData::SetDesiredChannel(int,int)"); 106 106 } 107 107 108 void ATSCStreamData::Reset(int desiredProgram )108 void ATSCStreamData::Reset(int desiredProgram, const QString &where) 109 109 { 110 Reset(-1,-1); 111 MPEGStreamData::Reset(desiredProgram); 110 VERBOSE(VB_IMPORTANT, 111 QString("ATSCStreamData::Reset(int) called from %1").arg(where)); 112 113 Reset(-1,-1, "ATSCStreamData::Reset(int)"); 114 115 MPEGStreamData::Reset(desiredProgram, "ATSCStreamData::Reset(int)"); 112 116 AddListeningPID(ATSC_PSIP_PID); 113 117 } 114 118 115 void ATSCStreamData::Reset(int major, int minor )119 void ATSCStreamData::Reset(int major, int minor, const QString &where) 116 120 { 121 VERBOSE(VB_IMPORTANT, 122 QString("ATSCStreamData::Reset(int,int) called from %1") 123 .arg(where)); 124 117 125 _desired_major_channel = major; 118 126 _desired_minor_channel = minor; 119 127 120 MPEGStreamData::Reset(-1 );128 MPEGStreamData::Reset(-1, "ATSCStreamData::Reset(int,int)"); 121 129 _mgt_version = -1; 122 130 _tvct_version.clear(); 123 131 _cvct_version.clear(); -
libs/libmythtv/mpeg/dvbstreamdata.cpp
167 167 void DVBStreamData::Reset(uint desired_netid, uint desired_tsid, 168 168 int desired_serviceid) 169 169 { 170 MPEGStreamData::Reset(desired_serviceid );170 MPEGStreamData::Reset(desired_serviceid, "DVBStreamData::Reset()"); 171 171 172 172 _desired_netid = desired_netid; 173 173 _desired_tsid = desired_tsid; -
libs/libmythtv/mpeg/mpegstreamdata.h
74 74 virtual ~MPEGStreamData(); 75 75 76 76 void SetCaching(bool cacheTables) { _cache_tables = cacheTables; } 77 virtual void Reset(int desiredProgram );77 virtual void Reset(int desiredProgram, const QString &where); 78 78 79 79 /// \brief Current Offset from computer time to DVB time in seconds 80 80 double TimeOffset(void) const; -
libs/libmythtv/mpeg/atscstreamdata.h
27 27 bool cacheTables = false); 28 28 ~ATSCStreamData(); 29 29 30 void Reset(void) { Reset(-1, -1); } 31 void Reset(int desiredProgram); 32 void Reset(int desiredMajorChannel, int desiredMinorChannel); 30 void Reset(const QString &where) { Reset(-1, -1, where); } 31 void Reset(int desiredProgram, const QString &where); 32 void Reset(int desiredMajorChannel, int desiredMinorChannel, 33 const QString &where); 33 34 void SetDesiredChannel(int major, int minor); 34 35 35 36 // Table processing -
libs/libmythtv/mpeg/scanstreamdata.cpp
34 34 35 35 void ScanStreamData::Reset(void) 36 36 { 37 MPEGStreamData::Reset(-1 );38 ATSCStreamData::Reset(-1,-1 );37 MPEGStreamData::Reset(-1, "ScanStreamData::Reset()"); 38 ATSCStreamData::Reset(-1,-1, "ScanStreamData::Reset()"); 39 39 DVBStreamData::Reset(0,0,-1); 40 40 41 41 AddListeningPID(MPEG_PAT_PID); -
libs/libmythtv/iptvrecorder.cpp
75 75 Open(); 76 76 77 77 if (_stream_data) 78 _stream_data->Reset(_stream_data->DesiredProgram() );78 _stream_data->Reset(_stream_data->DesiredProgram(), "iptvrecorder.cpp:78"); 79 79 80 80 DTVRecorder::Unpause(); 81 81 -
libs/libmythtv/tv_rec.cpp
1688 1688 GetDTVRecorder()->SetStreamData(asd); 1689 1689 } 1690 1690 1691 asd->Reset(major, minor );1691 asd->Reset(major, minor, "tv_rec.cpp:1691"); 1692 1692 sm->SetStreamData(sd); 1693 1693 sm->SetChannel(major, minor); 1694 1694 sd->SetVideoStreamsRequired(neededVideo); … … 1768 1768 sd->SetIgnoreCRC(GetDVBChannel()->HasCRCBug()); 1769 1769 #endif // USING_DVB 1770 1770 1771 sd->Reset(progNum );1771 sd->Reset(progNum, "tv_rec.cpp:1771"); 1772 1772 sm->SetStreamData(sd); 1773 1773 sm->SetProgramNumber(progNum); 1774 1774 sd->SetVideoStreamsRequired(neededVideo);