Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
- index ecb43af392..6556380a1f 100644
- --- a/mythtv/libs/libmythtv/tv_rec.cpp
- +++ b/mythtv/libs/libmythtv/tv_rec.cpp
- @@ -3551,48 +3551,6 @@ void TVRec::HandleTuning(void)
- }
- }
- -/** \fn TVRec::TuningCheckForHWChange(const TuningRequest&,QString&,QString&)
- - * \brief Returns inputid for device info row in capturecard if it changes.
- - */
- -uint TVRec::TuningCheckForHWChange(const TuningRequest &request,
- - QString &channum,
- - QString &inputname)
- -{
- - LOG(VB_RECORD, LOG_INFO, LOC + QString("request (%1) channum (%2) inputname (%3)")
- - .arg(request.toString()).arg(channum).arg(inputname));
- - if (!channel)
- - return 0;
- -
- - uint curInputID = 0, newInputID = 0;
- - channum = request.channel;
- - inputname = request.input;
- -
- - if (request.program)
- - request.program->QueryTuningInfo(channum, inputname);
- -
- - if (!channum.isEmpty() && inputname.isEmpty())
- - channel->CheckChannel(channum);
- -
- - if (!inputname.isEmpty())
- - {
- - curInputID = channel->GetInputID();
- - newInputID = channel->GetInputID();
- - LOG(VB_GENERAL, LOG_INFO, LOC + QString("HW Tuner: %1->%2")
- - .arg(curInputID).arg(newInputID));
- - }
- -
- - if (curInputID != newInputID || !CardUtil::IsChannelReusable(genOpt.inputtype))
- - {
- - LOG(VB_RECORD, LOG_INFO, LOC + QString("Inputtype HW Tuner newinputid channum curinputid: %1->%2 %3")
- - .arg(curInputID).arg(newInputID).arg(channum));
- - if (channum.isEmpty())
- - channum = GetStartChannel(newInputID);
- - return newInputID;
- - }
- -
- - return 0;
- -}
- -
- /** \fn TVRec::TuningShutdowns(const TuningRequest&)
- * \brief This shuts down anything that needs to be shut down
- * before handling the passed in tuning request.
- @@ -3603,7 +3561,6 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
- .arg(request.toString()));
- QString channum, inputname;
- - uint newInputID = TuningCheckForHWChange(request, channum, inputname);
- if (scanner && !(request.flags & kFlagEITScan) &&
- HasFlags(kFlagEITScannerRunning))
- @@ -3635,7 +3592,7 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
- // At this point any waits are canceled.
- - if (newInputID || (request.flags & kFlagNoRec))
- + if (request.flags & kFlagNoRec)
- {
- if (HasFlags(kFlagDummyRecorderRunning))
- {
- @@ -3659,19 +3616,6 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
- // At this point the channel is shut down
- }
- - // handle HW change for digital/analog inputs
- - if (newInputID)
- - {
- - LOG(VB_CHANNEL, LOG_INFO, LOC +
- - "TuningShutdowns: Recreating channel...");
- - channel->Close();
- - delete channel;
- - channel = NULL;
- -
- - GetDevices(newInputID, genOpt, dvbOpt, fwOpt);
- - CreateChannel(channum, false);
- - }
- -
- if (ringBuffer && (request.flags & kFlagKillRingBuffer))
- {
- LOG(VB_RECORD, LOG_INFO, LOC + "Tearing down RingBuffer");
- diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h
- index e8106d8b40..20fb29b21e 100644
- --- a/mythtv/libs/libmythtv/tv_rec.h
- +++ b/mythtv/libs/libmythtv/tv_rec.h
- @@ -299,9 +299,6 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
- void TuningNewRecorder(MPEGStreamData*);
- void TuningRestartRecorder(void);
- QString TuningGetChanNum(const TuningRequest&, QString &input) const;
- - uint TuningCheckForHWChange(const TuningRequest&,
- - QString &channum,
- - QString &inputname);
- bool TuningOnSameMultiplex(TuningRequest &request);
- void HandleStateChange(void);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement