Advertisement
Guest User

Untitled

a guest
Mar 14th, 2018
81
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.96 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
  2. index ecb43af392..6556380a1f 100644
  3. --- a/mythtv/libs/libmythtv/tv_rec.cpp
  4. +++ b/mythtv/libs/libmythtv/tv_rec.cpp
  5. @@ -3551,48 +3551,6 @@ void TVRec::HandleTuning(void)
  6. }
  7. }
  8.  
  9. -/** \fn TVRec::TuningCheckForHWChange(const TuningRequest&,QString&,QString&)
  10. - * \brief Returns inputid for device info row in capturecard if it changes.
  11. - */
  12. -uint TVRec::TuningCheckForHWChange(const TuningRequest &request,
  13. - QString &channum,
  14. - QString &inputname)
  15. -{
  16. - LOG(VB_RECORD, LOG_INFO, LOC + QString("request (%1) channum (%2) inputname (%3)")
  17. - .arg(request.toString()).arg(channum).arg(inputname));
  18. - if (!channel)
  19. - return 0;
  20. -
  21. - uint curInputID = 0, newInputID = 0;
  22. - channum = request.channel;
  23. - inputname = request.input;
  24. -
  25. - if (request.program)
  26. - request.program->QueryTuningInfo(channum, inputname);
  27. -
  28. - if (!channum.isEmpty() && inputname.isEmpty())
  29. - channel->CheckChannel(channum);
  30. -
  31. - if (!inputname.isEmpty())
  32. - {
  33. - curInputID = channel->GetInputID();
  34. - newInputID = channel->GetInputID();
  35. - LOG(VB_GENERAL, LOG_INFO, LOC + QString("HW Tuner: %1->%2")
  36. - .arg(curInputID).arg(newInputID));
  37. - }
  38. -
  39. - if (curInputID != newInputID || !CardUtil::IsChannelReusable(genOpt.inputtype))
  40. - {
  41. - LOG(VB_RECORD, LOG_INFO, LOC + QString("Inputtype HW Tuner newinputid channum curinputid: %1->%2 %3")
  42. - .arg(curInputID).arg(newInputID).arg(channum));
  43. - if (channum.isEmpty())
  44. - channum = GetStartChannel(newInputID);
  45. - return newInputID;
  46. - }
  47. -
  48. - return 0;
  49. -}
  50. -
  51. /** \fn TVRec::TuningShutdowns(const TuningRequest&)
  52. * \brief This shuts down anything that needs to be shut down
  53. * before handling the passed in tuning request.
  54. @@ -3603,7 +3561,6 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
  55. .arg(request.toString()));
  56.  
  57. QString channum, inputname;
  58. - uint newInputID = TuningCheckForHWChange(request, channum, inputname);
  59.  
  60. if (scanner && !(request.flags & kFlagEITScan) &&
  61. HasFlags(kFlagEITScannerRunning))
  62. @@ -3635,7 +3592,7 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
  63.  
  64. // At this point any waits are canceled.
  65.  
  66. - if (newInputID || (request.flags & kFlagNoRec))
  67. + if (request.flags & kFlagNoRec)
  68. {
  69. if (HasFlags(kFlagDummyRecorderRunning))
  70. {
  71. @@ -3659,19 +3616,6 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
  72. // At this point the channel is shut down
  73. }
  74.  
  75. - // handle HW change for digital/analog inputs
  76. - if (newInputID)
  77. - {
  78. - LOG(VB_CHANNEL, LOG_INFO, LOC +
  79. - "TuningShutdowns: Recreating channel...");
  80. - channel->Close();
  81. - delete channel;
  82. - channel = NULL;
  83. -
  84. - GetDevices(newInputID, genOpt, dvbOpt, fwOpt);
  85. - CreateChannel(channum, false);
  86. - }
  87. -
  88. if (ringBuffer && (request.flags & kFlagKillRingBuffer))
  89. {
  90. LOG(VB_RECORD, LOG_INFO, LOC + "Tearing down RingBuffer");
  91. diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h
  92. index e8106d8b40..20fb29b21e 100644
  93. --- a/mythtv/libs/libmythtv/tv_rec.h
  94. +++ b/mythtv/libs/libmythtv/tv_rec.h
  95. @@ -299,9 +299,6 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
  96. void TuningNewRecorder(MPEGStreamData*);
  97. void TuningRestartRecorder(void);
  98. QString TuningGetChanNum(const TuningRequest&, QString &input) const;
  99. - uint TuningCheckForHWChange(const TuningRequest&,
  100. - QString &channum,
  101. - QString &inputname);
  102. bool TuningOnSameMultiplex(TuningRequest &request);
  103.  
  104. void HandleStateChange(void);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement