Revert the ugly parts of 023b90f

I jumbled up streamdata with streamhander in my head while designing that part.
MythTV · Jan 21, 2013 · 080bf37 · 080bf37
1 parent 5a465ba
commit 080bf37
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 26 deletions.
diff --git a/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
@@ -57,7 +57,7 @@ ATSCStreamData::~ATSCStreamData()
     _atsc81_eit_listeners.clear();
 }
 
-void ATSCStreamData::SetDesiredChannel(int major, int minor, int cardid)
+void ATSCStreamData::SetDesiredChannel(int major, int minor)
 {
     bool reset = true;
     const MasterGuideTable *mgt = GetCachedMGT();
@@ -91,12 +91,12 @@ void ATSCStreamData::SetDesiredChannel(int major, int minor, int cardid)
             if (cvct)
             {
                 ProcessCVCT(cvct->TransportStreamID(), cvct);
-                SetDesiredProgram(cvct->ProgramNumber(chan_idx), cardid);
+                SetDesiredProgram(cvct->ProgramNumber(chan_idx));
             }
             else if (tvct)
             {
                 ProcessTVCT(tvct->TransportStreamID(), tvct);
-                SetDesiredProgram(tvct->ProgramNumber(chan_idx), cardid);
+                SetDesiredProgram(tvct->ProgramNumber(chan_idx));
             }
             reset = false;
         }

diff --git a/mythtv/libs/libmythtv/mpeg/atscstreamdata.h b/mythtv/libs/libmythtv/mpeg/atscstreamdata.h
@@ -35,7 +35,7 @@ class MTV_PUBLIC ATSCStreamData : virtual public MPEGStreamData
     virtual void Reset(void) { ResetATSC(-1, -1); }
     virtual void ResetMPEG(int desiredProgram);
     virtual void ResetATSC(int desiredMajorChannel, int desiredMinorChannel);
-    void SetDesiredChannel(int major, int minor, int cardid);
+    void SetDesiredChannel(int major, int minor);
 
     // Table processing
     virtual bool HandleTables(uint pid, const PSIPTable &psip);

diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
@@ -40,8 +40,7 @@ DVBStreamData::~DVBStreamData()
     _dvb_has_eit.clear();
 }
 
-void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid,
-                                      int cardid)
+void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid)
 {
     bool reset = true;
 
@@ -63,7 +62,7 @@ void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid,
                 ProcessSDT(_desired_tsid, sdt);
                 ReturnCachedTable(sdt);
             }
-            SetDesiredProgram(serviceid, cardid);
+            SetDesiredProgram(serviceid);
         }
     }
 

diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.h b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.h
@@ -36,7 +36,7 @@ class MTV_PUBLIC DVBStreamData : virtual public MPEGStreamData
         uint desired_netid, uint desired_tsid, int desired_sid);
 
     // DVB table monitoring
-    void SetDesiredService(uint netid, uint tsid, int serviceid, int cardid);
+    void SetDesiredService(uint netid, uint tsid, int serviceid);
     uint DesiredNetworkID(void)   const { return _desired_netid; }
     uint DesiredTransportID(void) const { return _desired_tsid;  }
 

diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
@@ -105,15 +105,15 @@ MPEGStreamData::~MPEGStreamData()
     _mpeg_sp_listeners.clear();
 }
 
-void MPEGStreamData::SetDesiredProgram(int p, int cardid)
+void MPEGStreamData::SetDesiredProgram(int p)
 {
     bool reset = true;
     uint pid = 0;
     const ProgramAssociationTable* pat = NULL;
     pat_vec_t pats = GetCachedPATs();
 
-    LOG(VB_RECORD, LOG_INFO, QString("SetDesiredProgram[%1] (%2)")
-        .arg(cardid).arg(p));
+    LOG(VB_RECORD, LOG_INFO, QString("SetDesiredProgram(%2)")
+        .arg(p));
 
     for (uint i = (p) ? 0 : pats.size(); i < pats.size() && !pid; i++)
     {

diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.h b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
@@ -291,7 +291,7 @@ class MTV_PUBLIC MPEGStreamData : public EITSource
 
   public:
     // Single program stuff, sets
-    void SetDesiredProgram(int p, int cardid);
+    void SetDesiredProgram(int p);
     inline void SetPATSingleProgram(ProgramAssociationTable*);
     inline void SetPMTSingleProgram(ProgramMapTable*);
     void SetVideoStreamsRequired(uint num)

diff --git a/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp b/mythtv/libs/libmythtv/recorders/dtvrecorder.cpp
@@ -269,11 +269,9 @@ void DTVRecorder::InitStreamData(void)
 
     if (atsc && atsc->DesiredMinorChannel())
         atsc->SetDesiredChannel(atsc->DesiredMajorChannel(),
-                                atsc->DesiredMinorChannel(),
-                                tvrec ? tvrec->GetCaptureCardNum() : -1);
+                                atsc->DesiredMinorChannel());
     else if (_stream_data->DesiredProgram() >= 0)
-        _stream_data->SetDesiredProgram(_stream_data->DesiredProgram(),
-                                       tvrec ? tvrec->GetCaptureCardNum() : -1);
+        _stream_data->SetDesiredProgram(_stream_data->DesiredProgram());
 }
 
 void DTVRecorder::BufferedWrite(const TSPacket &tspacket)

diff --git a/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp
@@ -213,7 +213,7 @@ void DTVSignalMonitor::SetChannel(int major, int minor)
                     kDTVSigMon_CryptSeen | kDTVSigMon_CryptMatch);
         majorChannel = major;
         minorChannel = minor;
-        GetATSCStreamData()->SetDesiredChannel(major, minor, capturecardnum);
+        GetATSCStreamData()->SetDesiredChannel(major, minor);
         AddFlags(kDTVSigMon_WaitForVCT | kDTVSigMon_WaitForPAT);
     }
 }
@@ -228,7 +228,7 @@ void DTVSignalMonitor::SetProgramNumber(int progNum)
                     kDTVSigMon_CryptSeen | kDTVSigMon_CryptMatch);
         programNumber = progNum;
         if (GetStreamData())
-            GetStreamData()->SetDesiredProgram(programNumber, capturecardnum);
+            GetStreamData()->SetDesiredProgram(programNumber);
         AddFlags(kDTVSigMon_WaitForPMT);
     }
 }
@@ -255,8 +255,7 @@ void DTVSignalMonitor::SetDVBService(uint netid, uint tsid, int serviceid)
 
     if (GetDVBStreamData())
     {
-        GetDVBStreamData()->SetDesiredService(netid, tsid, programNumber,
-                                              capturecardnum);
+        GetDVBStreamData()->SetDesiredService(netid, tsid, programNumber);
         AddFlags(kDTVSigMon_WaitForPMT | kDTVSigMon_WaitForSDT);
         GetDVBStreamData()->AddListeningPID(DVB_SDT_PID);
     }

diff --git a/mythtv/libs/libmythtv/recorders/firewirerecorder.cpp b/mythtv/libs/libmythtv/recorders/firewirerecorder.cpp
@@ -225,6 +225,5 @@ void FirewireRecorder::InitStreamData(void)
     _stream_data->AddMPEGSPListener(this);
 
     if (_stream_data->DesiredProgram() >= 0)
-        _stream_data->SetDesiredProgram(_stream_data->DesiredProgram(),
-                                tvrec ? tvrec->GetCaptureCardNum() : -1);
+        _stream_data->SetDesiredProgram(_stream_data->DesiredProgram());
 }
diff --git a/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp
@@ -1368,7 +1368,7 @@ void MpegRecorder::StopEncoding(void)
 void MpegRecorder::InitStreamData(void)
 {
     _stream_data->AddMPEGSPListener(this);
-    _stream_data->SetDesiredProgram(1, tvrec ? tvrec->GetCaptureCardNum() : -1);
+    _stream_data->SetDesiredProgram(1);
 }
 
 void MpegRecorder::SetBitrate(int bitrate, int maxbitrate,

diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
@@ -3718,15 +3718,14 @@ void TVRec::TuningFrequency(const TuningRequest &request)
 
             ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(mpeg);
             if (atsc)
-                atsc->SetDesiredChannel(request.majorChan, request.minorChan,
-                                        cardid);
+                atsc->SetDesiredChannel(request.majorChan, request.minorChan);
         }
         else if (request.progNum >= 0)
         {
             channel->SetChannelByString(request.channel);
 
             if (mpeg)
-                mpeg->SetDesiredProgram(request.progNum, cardid);
+                mpeg->SetDesiredProgram(request.progNum);
         }
     }