Ticket #6719: channel-thread-v1.4a.patch
File channel-thread-v1.4a.patch, 51.2 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/analogsignalmonitor.cpp
old new void AnalogSignalMonitor::UpdateValues(v 31 31 int videofd = channel->GetFd(); 32 32 if (videofd < 0) 33 33 return; 34 34 35 if (!IsChannelTuned()) 36 return; 37 35 38 bool isLocked = false; 36 39 if (usingv4l2) 37 40 { 38 41 struct v4l2_tuner tuner; -
libs/libmythtv/channelbase.cpp
old new using namespace std; 34 34 #define LOC QString("ChannelBase(%1): ").arg(GetCardID()) 35 35 #define LOC_WARN QString("ChannelBase(%1) Warning: ").arg(GetCardID()) 36 36 #define LOC_ERR QString("ChannelBase(%1) Error: ").arg(GetCardID()) 37 37 38 /* 39 * Run the channel change thread, and report the status when done 40 */ 41 void ChannelThread::run(void) 42 { 43 bool result = tuner->SetChannelByString(channel); 44 tuner->setStatus(result ? 45 ChannelBase::changeSuccess : ChannelBase::changeFailed); 46 } 47 38 48 ChannelBase::ChannelBase(TVRec *parent) 39 49 : 40 50 pParent(parent), curchannelname(""), 41 currentInputID(-1), commfree(false), cardid(0) 51 currentInputID(-1), commfree(false), cardid(0), 52 abort_change(false) 42 53 { 54 tuneStatus = changeUnknown; 55 tuneThread.tuner = this; 43 56 } 44 57 45 58 ChannelBase::~ChannelBase(void) 46 59 { 60 TeardownAll(); 61 } 62 63 void ChannelBase::TeardownAll(void) 64 { 65 if (tuneThread.isRunning()) 66 { 67 thread_lock.lock(); 68 abort_change = true; 69 tuneCond.wakeAll(); 70 thread_lock.unlock(); 71 tuneThread.wait(); 72 } 73 } 74 75 void ChannelBase::SelectChannel(const QString & chan) 76 { 77 VERBOSE(VB_CHANNEL, LOC + "SelectChannel " + chan); 78 TeardownAll(); 79 80 thread_lock.lock(); 81 abort_change = false; 82 tuneStatus = changePending; 83 thread_lock.unlock(); 84 85 curchannelname = tuneThread.channel = chan; 86 tuneThread.start(); 87 } 88 89 /* 90 * Returns true of the channel change thread should abort 91 */ 92 bool ChannelBase::Aborted(void) 93 { 94 bool result; 95 96 thread_lock.lock(); 97 result = abort_change; 98 thread_lock.unlock(); 99 100 return result; 101 } 102 103 ChannelBase::Status ChannelBase::GetStatus(void) 104 { 105 Status status; 106 107 thread_lock.lock(); 108 status = tuneStatus; 109 thread_lock.unlock(); 110 111 return status; 112 } 113 114 ChannelBase::Status ChannelBase::Wait(void) 115 { 116 tuneThread.wait(); 117 return tuneStatus; 118 } 119 120 void ChannelBase::setStatus(ChannelBase::Status status) 121 { 122 thread_lock.lock(); 123 tuneStatus = status; 124 thread_lock.unlock(); 47 125 } 48 126 49 127 bool ChannelBase::Init(QString &inputname, QString &startchannel, bool setchan) 50 128 { 51 129 bool ok; 52 130 131 VERBOSE(VB_CHANNEL, LOC + QString("Init(%1, %2, %3)") 132 .arg(inputname).arg(startchannel).arg(setchan)); 133 53 134 if (!setchan) 54 135 ok = inputname.isEmpty() ? false : IsTunable(inputname, startchannel); 55 136 else if (inputname.isEmpty()) 56 ok = SetChannelByString(startchannel); 137 { 138 SelectChannel(startchannel); 139 ok = Wait(); 140 } 57 141 else 58 142 ok = SwitchToInput(inputname, startchannel); 59 143 60 144 if (ok) … … bool ChannelBase::Init(QString &inputnam 123 207 124 208 if (chanid && cit != channels.end()) 125 209 { 126 210 if (!setchan) 127 {128 211 ok = IsTunable(*it, (mplexid_restriction) ? 129 212 (*cit).channum : startchannel); 130 }131 213 else 132 214 ok = SwitchToInput(*it, (*cit).channum); 133 215 134 216 if (ok) … … int ChannelBase::GetInputByName(const QS 328 410 } 329 411 return -1; 330 412 } 331 413 414 #if 0 // Not used? 332 415 bool ChannelBase::SwitchToInput(const QString &inputname) 333 416 { 334 417 int input = GetInputByName(inputname); 335 418 … … bool ChannelBase::SwitchToInput(const QS 339 422 VERBOSE(VB_IMPORTANT, QString("ChannelBase: Could not find input: " 340 423 "%1 on card\n").arg(inputname)); 341 424 return false; 342 425 } 426 #endif 427 428 bool ChannelBase::SelectInput(const QString &inputname, const QString &chan) 429 { 430 int input = GetInputByName(inputname); 431 432 VERBOSE(VB_CHANNEL, LOC + QString("SelectInput(%1, %2) %3") 433 .arg(inputname).arg(chan).arg(input)); 434 435 if (input >= 0) 436 { 437 if (!SwitchToInput(input, false)) 438 return false; 439 SelectChannel(chan); 440 } 441 else 442 { 443 VERBOSE(VB_IMPORTANT, 444 QString("ChannelBase: Could not find input: %1 on card when " 445 "setting channel %2\n").arg(inputname).arg(chan)); 446 return false; 447 } 448 449 return true; 450 } 343 451 344 452 bool ChannelBase::SwitchToInput(const QString &inputname, const QString &chan) 345 453 { 346 454 int input = GetInputByName(inputname); 347 455 348 bool ok = false; 456 VERBOSE(VB_CHANNEL, LOC + QString("SwitchToInput(%1, %2), %3") 457 .arg(inputname).arg(chan).arg(input)); 458 349 459 if (input >= 0) 350 460 { 351 ok = SwitchToInput(input, false);352 if (ok)353 ok =SetChannelByString(chan);461 if (!SwitchToInput(input, false)) 462 return false; 463 return SetChannelByString(chan); 354 464 } 355 465 else 356 466 { 357 467 VERBOSE(VB_IMPORTANT, 358 468 QString("ChannelBase: Could not find input: %1 on card when " 359 469 "setting channel %2\n").arg(inputname).arg(chan)); 470 return false; 360 471 } 361 return ok; 472 473 return true; 362 474 } 363 475 364 476 bool ChannelBase::SwitchToInput(int newInputNum, bool setstarting) 365 477 { 478 VERBOSE(VB_CHANNEL, LOC + QString("SwitchToInput(%1, %2)") 479 .arg(newInputNum).arg(setstarting)); 480 366 481 InputMap::const_iterator it = inputs.find(newInputNum); 367 482 if (it == inputs.end() || (*it)->startChanNum.isEmpty()) 368 483 return false; 369 484 … … bool ChannelBase::SwitchToInput(int newI 373 488 374 489 // input switching code would go here 375 490 376 491 if (setstarting) 377 return SetChannelByString((*it)->startChanNum);492 SelectChannel((*it)->startChanNum); 378 493 379 494 return true; 380 495 } 381 496 … … static bool is_input_busy( 484 599 } 485 600 return is_busy; 486 601 } 487 602 488 bool ChannelBase::IsInputAvailable( 489 int inputid, uint &mplexid_restriction) const 603 bool ChannelBase::IsInputAvailable(int inputid, uint &mplexid_restriction) const 490 604 { 491 605 if (inputid < 0) 492 606 return false; 493 607 … … bool ChannelBase::ChangeExternalChannel( 650 764 _exit(CHANNEL__EXIT__EXECL_ERROR); // this exit is ok 651 765 } 652 766 else 653 767 { // child contains the pid of the new process 654 int status = 0, pid = 0; 768 QMutex lock; 769 int status = 0, pid = 0; 770 655 771 VERBOSE(VB_CHANNEL, "Waiting for External Tuning program to exit"); 656 772 657 773 bool timed_out = false; 658 774 uint timeout = 30; // how long to wait in seconds 659 775 time_t start_time = time(0); 660 while (-1 != pid && !timed_out )776 while (-1 != pid && !timed_out && !Aborted()) 661 777 { 662 sleep(1); 778 lock.lock(); 779 tuneCond.wait(&lock, 500); // sleep up to 0.5 seconds 663 780 pid = waitpid(child, &status, WUNTRACED|WNOHANG); 664 781 VERBOSE(VB_IMPORTANT, QString("ret_pid(%1) child(%2) status(0x%3)") 665 782 .arg(pid).arg(child).arg(status,0,16)); 666 783 if (pid==child) 784 { 785 lock.unlock(); 667 786 break; 787 } 668 788 else if (time(0) > (time_t)(start_time + timeout)) 669 789 timed_out = true; 790 lock.unlock(); 670 791 } 671 if (timed_out) 792 793 if (timed_out || Aborted()) 672 794 { 673 VERBOSE(VB_IMPORTANT, "External Tuning program timed out, killing"); 795 if (Aborted()) 796 VERBOSE(VB_IMPORTANT, "Aborting External Tuning program"); 797 else 798 VERBOSE(VB_IMPORTANT, "External Tuning program timed out, " 799 "killing"); 674 800 kill(child, SIGTERM); 675 801 usleep(500); 676 802 kill(child, SIGKILL); 677 803 return false; -
libs/libmythtv/channelbase.h
old new 5 5 6 6 // Qt headers 7 7 #include <qmap.h> 8 8 #include <qstringlist.h> 9 #include <qwaitcondition.h> 10 #include <qmutex.h> 11 #include <qthread.h> 9 12 10 13 // MythTV headers 11 14 #include "channelutil.h" 12 15 #include "inputinfo.h" 13 16 #include "tv.h" 14 17 15 18 class TVRec; 19 class ChannelBase; 20 21 /* 22 * Thread to run tunning process in 23 */ 24 class ChannelThread : public QThread 25 { 26 public: 27 virtual void run(void); 28 29 QString channel; 30 ChannelBase *tuner; 31 }; 16 32 17 33 /** \class ChannelBase 18 34 * \brief Abstract class providing a generic interface to tuning hardware. 19 35 * … … class TVRec; 23 39 */ 24 40 25 41 class ChannelBase 26 42 { 27 public: 43 friend class ChannelThread; 44 45 public: 46 enum Status { changeUnknown = 'U', changePending = 'P', 47 changeFailed = 'F', changeSuccess = 'S' }; 48 28 49 ChannelBase(TVRec *parent); 29 virtual ~ChannelBase( );50 virtual ~ChannelBase(void); 30 51 31 52 virtual bool Init(QString &inputname, QString &startchannel, bool setchan); 32 53 virtual bool IsTunable(const QString &input, const QString &channum) const; 33 54 55 virtual void SelectChannel(const QString & chan); 56 57 Status GetStatus(void); 58 Status Wait(void); 59 34 60 // Methods that must be implemented. 35 61 /// \brief Opens the channel changing hardware for use. 36 62 virtual bool Open(void) = 0; 37 63 /// \brief Closes the channel changing hardware to use. 38 64 virtual void Close(void) = 0; 39 virtual bool SetChannelByString(const QString &chan) = 0;40 65 /// \brief Reports whether channel is already open 41 66 virtual bool IsOpen(void) const = 0; 42 67 43 68 // Methods that one might want to specialize … … class ChannelBase 82 107 virtual void Renumber(uint srcid, const QString &oldChanNum, 83 108 const QString &newChanNum); 84 109 85 110 // Input toggling convenience methods 86 virtual bool SwitchToInput(const QString &input); 87 virtual bool SwitchToInput(const QString &input, const QString &chan); 111 112 // virtual bool SwitchToInput(const QString &input); // not used? 113 virtual bool SelectInput(const QString &input, const QString &chan); 88 114 89 115 virtual bool InitializeInputs(void); 90 116 91 117 // Misc. Commands … … class ChannelBase 108 134 void SetCardID(uint _cardid) { cardid = _cardid; } 109 135 110 136 virtual int GetCardID(void) const; 111 137 protected: 138 virtual bool SetChannelByString(const QString &chan) = 0; 139 112 140 /// \brief Switches to another input on hardware, 113 141 /// and sets the channel is setstarting is true. 142 virtual bool SwitchToInput(const QString &input, const QString &chan); 114 143 virtual bool SwitchToInput(int inputNum, bool setstarting); 115 144 virtual bool IsInputAvailable( 116 145 int inputNum, uint &mplexid_restriction) const; 117 146 118 147 virtual bool ChangeExternalChannel(const QString &newchan); 119 148 static void StoreInputChannels(const InputMap&); 120 149 static void StoreDefaultInput(uint cardid, const QString &input); 121 150 151 bool Aborted(); 152 void setStatus(Status status); 153 void TeardownAll(void); 154 122 155 TVRec *pParent; 123 156 QString curchannelname; 124 157 int currentInputID; 125 158 bool commfree; 126 159 uint cardid; 127 160 InputMap inputs; 128 161 DBChanList allchannels; ///< channels across all inputs 162 163 QWaitCondition tuneCond; 164 165 private: 166 mutable ChannelThread tuneThread; 167 Status tuneStatus; 168 QMutex thread_lock; 169 bool abort_change; 129 170 }; 130 171 131 172 #endif 132 173 -
new file libs/libmythtv/channelchangemonitor.cpp
- + 1 // -*- Mode: c++ -*- 2 3 #include <cerrno> 4 #include <unistd.h> 5 #include <sys/ioctl.h> 6 7 #include "videodev_myth.h" 8 #include "mythcontext.h" 9 #include "channelchangemonitor.h" 10 #include "v4lchannel.h" 11 12 #define LOC QString("ChannelChangeM: ").arg(channel->GetDevice()) 13 #define LOC_ERR QString("ChannelChangeM, Error: ").arg(channel->GetDevice()) 14 15 ChannelChangeMonitor::ChannelChangeMonitor( 16 int db_cardnum, V4LChannel *_channel, uint64_t _flags) : 17 SignalMonitor(db_cardnum, _channel, _flags) 18 { 19 } 20 21 void ChannelChangeMonitor::UpdateValues(void) 22 { 23 if (!running || exit) 24 return; 25 26 if (!IsChannelTuned()) 27 return; 28 29 { 30 QMutexLocker locker(&statusLock); 31 signalLock.SetValue(true); 32 signalStrength.SetValue(100); 33 } 34 35 EmitStatus(); 36 SendMessageAllGood(); 37 } 38 -
new file libs/libmythtv/channelchangemonitor.h
- + 1 // -*- Mode: c++ -*- 2 // Copyright (c) 2005, Daniel Thor Kristjansson 3 4 #ifndef _CHANNEL_CHANGE_MONITOR_H_ 5 #define _CHANNEL_CHANGE_MONITOR_H_ 6 7 // MythTV headers 8 #include "signalmonitor.h" 9 10 class V4LChannel; 11 12 class ChannelChangeMonitor : public SignalMonitor 13 { 14 public: 15 ChannelChangeMonitor( 16 int db_cardnum, V4LChannel *_channel, 17 uint64_t _flags = kSigMon_WaitForSig); 18 19 virtual void UpdateValues(void); 20 }; 21 22 #endif // _CHANNEL_CHANGE_MONITOR_H_ -
libs/libmythtv/channelscan/channelscan_sm.cpp
old new void ChannelScanSM::ScanTransport(const 1501 1501 GetDTVSignalMonitor()->SetChannel(-1,-1); 1502 1502 } 1503 1503 1504 1504 // Start signal monitor for this channel 1505 signalMonitor->Start( );1505 signalMonitor->Start(false); 1506 1506 1507 1507 timer.start(); 1508 1508 waitingForTables = true; 1509 1509 } -
libs/libmythtv/channelscan/channelscan_sm.h
old new class AnalogSignalHandler : public Signa 73 73 AnalogSignalHandler(ChannelScanSM *_siscan) : siscan(_siscan) { } 74 74 75 75 public slots: 76 76 virtual inline void AllGood(void); 77 virtual void StatusChannelTuned(const SignalMonitorValue&) { } 77 78 virtual void StatusSignalLock(const SignalMonitorValue&) { } 78 79 virtual void StatusSignalStrength(const SignalMonitorValue&) { } 79 80 80 81 private: -
libs/libmythtv/channelscan/channelscanner_cli.cpp
old new void ChannelScannerCLI::HandleEvent(cons 91 91 status_complete = scanEvent->intValue(); 92 92 break; 93 93 case ScannerEvent::SetStatusRotorPosition: 94 94 break; 95 case ScannerEvent::SetStatusChannelTuned: 96 break; 95 97 case ScannerEvent::SetStatusSignalLock: 96 98 status_lock = scanEvent->intValue(); 97 99 break; 98 100 case ScannerEvent::SetStatusSignalToNoise: -
libs/libmythtv/channelscan/channelscanner_gui.cpp
old new void ChannelScannerGUI::HandleEvent(cons 155 155 break; 156 156 case ScannerEvent::SetStatusRotorPosition: 157 157 scanStage->SetStatusRotorPosition(scanEvent->intValue()); 158 158 break; 159 case ScannerEvent::SetStatusChannelTuned: 160 break; 159 161 case ScannerEvent::SetStatusSignalLock: 160 162 scanStage->SetStatusLock(scanEvent->intValue()); 161 163 break; 162 164 case ScannerEvent::SetStatusSignalToNoise: -
libs/libmythtv/channelscan/scanmonitor.cpp
old new void ScanMonitor::StatusRotorPosition(co 106 106 post_event(this, ScannerEvent::SetStatusRotorPosition, 107 107 val.GetNormalizedValue(0, 65535)); 108 108 } 109 109 110 void ScanMonitor::StatusChannelTuned(const SignalMonitorValue &val) 111 { 112 post_event(this, ScannerEvent::SetStatusChannelTuned, val.GetValue()); 113 } 114 110 115 void ScanMonitor::StatusSignalLock(const SignalMonitorValue &val) 111 116 { 112 117 post_event(this, ScannerEvent::SetStatusSignalLock, val.GetValue()); 113 118 } -
libs/libmythtv/channelscan/scanmonitor.h
old new class ScanMonitor : 63 63 void ScanComplete(void); 64 64 65 65 // SignalMonitorListener 66 66 virtual void AllGood(void) { } 67 virtual void StatusChannelTuned(const SignalMonitorValue&); 67 68 virtual void StatusSignalLock(const SignalMonitorValue&); 68 69 virtual void StatusSignalStrength(const SignalMonitorValue&); 69 70 70 71 // DVBSignalMonitorListener … … class ScannerEvent : public QEvent 97 98 SetStatusRotorPosition, 98 99 SetStatusSignalToNoise, 99 100 SetStatusSignalStrength, 100 101 SetStatusSignalLock, 102 SetStatusChannelTuned 101 103 }; 102 104 103 105 ScannerEvent(TYPE t) : 104 106 QEvent((QEvent::Type)(t + QEvent::User)), -
libs/libmythtv/dtvsignalmonitor.cpp
old new DTVSignalMonitor::DTVSignalMonitor(int d 24 24 DTVChannel *_channel, 25 25 uint64_t wait_for_mask) 26 26 : SignalMonitor(db_cardnum, _channel, wait_for_mask), 27 27 stream_data(NULL), 28 channelTuned(QObject::tr("Channel Tuned"), "tuned", 3, true, 0, 3, 0), 28 29 seenPAT(QObject::tr("Seen")+" PAT", "seen_pat", 1, true, 0, 1, 0), 29 30 seenPMT(QObject::tr("Seen")+" PMT", "seen_pmt", 1, true, 0, 1, 0), 30 31 seenMGT(QObject::tr("Seen")+" MGT", "seen_mgt", 1, true, 0, 1, 0), 31 32 seenVCT(QObject::tr("Seen")+" VCT", "seen_vct", 1, true, 0, 1, 0), … … DTVChannel *DTVSignalMonitor::GetDTVChan 62 63 QStringList DTVSignalMonitor::GetStatusList(bool kick) 63 64 { 64 65 QStringList list = SignalMonitor::GetStatusList(kick); 65 66 QMutexLocker locker(&statusLock); 67 68 // tuned? 69 if (flags & kSigMon_Tuned) 70 { 71 list<<channelTuned.GetName()<<channelTuned.GetStatus(); 72 } 73 66 74 // mpeg tables 67 75 if (flags & kDTVSigMon_WaitForPAT) 68 76 { 69 77 list<<seenPAT.GetName()<<seenPAT.GetStatus(); … … void DTVSignalMonitor::RemoveFlags(uint6 137 145 138 146 void DTVSignalMonitor::UpdateMonitorValues(void) 139 147 { 140 148 QMutexLocker locker(&statusLock); 149 channelTuned.SetValue((flags & kSigMon_Tuned) ? 3 : 1); 141 150 seenPAT.SetValue( (flags & kDTVSigMon_PATSeen) ? 1 : 0); 142 151 seenPMT.SetValue( (flags & kDTVSigMon_PMTSeen) ? 1 : 0); 143 152 seenMGT.SetValue( (flags & kDTVSigMon_MGTSeen) ? 1 : 0); 144 153 seenVCT.SetValue( (flags & kDTVSigMon_VCTSeen) ? 1 : 0); -
libs/libmythtv/dtvsignalmonitor.h
old new class DTVSignalMonitor : public SignalMo 110 110 111 111 protected: 112 112 MPEGStreamData *stream_data; 113 113 vector<uint> eit_pids; 114 SignalMonitorValue channelTuned; 114 115 SignalMonitorValue seenPAT; 115 116 SignalMonitorValue seenPMT; 116 117 SignalMonitorValue seenMGT; 117 118 SignalMonitorValue seenVCT; -
libs/libmythtv/dvbsignalmonitor.cpp
old new void DVBSignalMonitor::UpdateValues(void 229 229 update_done = true; 230 230 return; 231 231 } 232 232 233 if (!IsChannelTuned()) 234 return; 235 233 236 AddFlags(kSigMon_WaitForSig); 234 237 235 238 DVBChannel *dvbchannel = GetDVBChannel(); 236 239 if (!dvbchannel) -
libs/libmythtv/firewiresignalmonitor.cpp
old new void FirewireSignalMonitor::UpdateValues 189 189 { 190 190 if (!running || exit) 191 191 return; 192 192 193 if (!IsChannelTuned()) 194 return; 195 193 196 if (dtvMonitorRunning) 194 197 { 195 198 EmitStatus(); 196 199 if (IsAllGood()) -
libs/libmythtv/hdhrchannel.cpp
old new bool HDHRChannel::SetChannelByString(con 142 142 uint mplexid_restriction; 143 143 if (!IsInputAvailable(currentInputID, mplexid_restriction)) 144 144 return false; 145 145 146 if (Aborted()) 147 return false; 148 146 149 // Fetch tuning data from the database. 147 150 QString tvformat, modulation, freqtable, freqid, si_std; 148 151 int finetune; 149 152 uint64_t frequency; -
libs/libmythtv/hdhrsignalmonitor.cpp
old new void HDHRSignalMonitor::UpdateValues(voi 104 104 update_done = true; 105 105 return; 106 106 } 107 107 108 if (!IsChannelTuned()) 109 return; 110 108 111 struct hdhomerun_tuner_status_t status; 109 112 streamHandler->GetTunerStatus(&status); 110 113 111 114 uint sig = status.signal_strength; -
libs/libmythtv/iptvsignalmonitor.cpp
old new void IPTVSignalMonitor::UpdateValues(voi 118 118 { 119 119 if (!running || exit) 120 120 return; 121 121 122 if (!IsChannelTuned()) 123 return; 124 122 125 if (dtvMonitorRunning) 123 126 { 124 127 EmitStatus(); 125 128 if (IsAllGood()) -
libs/libmythtv/libmythtv.pro
old new using_backend { 449 449 DEFINES += USING_OSS 450 450 LIBS += $$OSS_LIBS 451 451 } 452 452 453 HEADERS += channelchangemonitor.h 454 SOURCES += channelchangemonitor.cpp 455 453 456 # Support for Video4Linux devices 454 457 using_v4l { 455 458 HEADERS += v4lchannel.h analogsignalmonitor.h 456 459 SOURCES += v4lchannel.cpp analogsignalmonitor.cpp -
libs/libmythtv/signalmonitor.cpp
old new 7 7 #include <unistd.h> 8 8 9 9 // MythTV headers 10 10 #include "mythcontext.h" 11 #include "tv_rec.h" 11 12 #include "signalmonitor.h" 12 13 #include "compat.h" 13 14 #include "mythverbose.h" 14 15 … … extern "C" { 41 42 # include "firewiresignalmonitor.h" 42 43 # include "firewirechannel.h" 43 44 #endif 44 45 46 #include "channelchangemonitor.h" 47 45 48 #undef DBG_SM 46 49 #define DBG_SM(FUNC, MSG) VERBOSE(VB_CHANNEL, \ 47 50 "SM("<<channel->GetDevice()<<")::"<<FUNC<<": "<<MSG); 48 51 … … SignalMonitor *SignalMonitor::Init(QStri 92 95 } 93 96 #endif 94 97 95 98 #ifdef USING_V4L 99 #if 0 // Just use ChannelChangeMonitor for these types 96 100 if ((cardtype.toUpper() == "V4L") || 97 (cardtype.toUpper() == "MPEG") || 98 (cardtype.toUpper() == "HDPVR")) 101 (cardtype.toUpper() == "MPEG")) 99 102 { 100 103 V4LChannel *chan = dynamic_cast<V4LChannel*>(channel); 101 104 if (chan) 102 105 signalMonitor = new AnalogSignalMonitor(db_cardnum, chan); 103 106 } 104 107 #endif 108 #endif 105 109 106 110 #ifdef USING_HDHOMERUN 107 111 if (cardtype.toUpper() == "HDHOMERUN") 108 112 { … … SignalMonitor *SignalMonitor::Init(QStri 131 135 #endif 132 136 133 137 if (!signalMonitor) 134 138 { 139 V4LChannel *chan = dynamic_cast<V4LChannel*>(channel); 140 if (chan) 141 signalMonitor = new ChannelChangeMonitor(db_cardnum, chan); 142 } 143 144 if (!signalMonitor) 145 { 135 146 VERBOSE(VB_IMPORTANT, 136 147 QString("Failed to create signal monitor in Init(%1, %2, 0x%3)") 137 148 .arg(cardtype).arg(db_cardnum).arg((long)channel,0,16)); 138 149 } … … SignalMonitor::SignalMonitor(int _captur 159 170 capturecardnum(_capturecardnum), flags(wait_for_mask), 160 171 update_rate(25), minimum_update_rate(5), 161 172 running(false), exit(false), 162 173 update_done(false), notify_frontend(true), 163 error(""), 174 is_tuned(false), tablemon(false), 175 eit_scan(false), error(""), 164 176 signalLock (QObject::tr("Signal Lock"), "slock", 165 177 1, true, 0, 1, 0), 166 178 signalStrength(QObject::tr("Signal Power"), "signal", 167 179 0, true, 0, 100, 0), 180 channelTuned("Channel Tuned", "tuned", 3, true, 0, 3, 0), 168 181 statusLock(QMutex::Recursive) 169 182 { 170 183 } 171 184 … … bool SignalMonitor::HasAnyFlag(uint64_t 201 214 202 215 /** \fn SignalMonitor::Start() 203 216 * \brief Start signal monitoring thread. 204 217 */ 205 void SignalMonitor::Start( )218 void SignalMonitor::Start(bool waitfor_tune) 206 219 { 207 220 DBG_SM("Start", "begin"); 208 221 { 209 222 QMutexLocker locker(&startStopLock); 223 224 // When used for scanning, don't wait for the tuning thread 225 is_tuned = !waitfor_tune; 226 210 227 if (!running) 211 228 { 212 229 int rval = pthread_create( 213 230 &monitor_thread, NULL, SpawnMonitorLoop, this); … … QStringList SignalMonitor::GetStatusList 278 295 UpdateValues(); 279 296 280 297 QStringList list; 281 298 statusLock.lock(); 299 list<<channelTuned.GetName()<<channelTuned.GetStatus(); 282 300 list<<signalLock.GetName()<<signalLock.GetStatus(); 283 301 if (HasFlags(kSigMon_WaitForSig)) 284 302 list<<signalStrength.GetName()<<signalStrength.GetStatus(); 285 303 statusLock.unlock(); … … void SignalMonitor::MonitorLoop() 305 323 { 306 324 QStringList slist = GetStatusList(false); 307 325 MythEvent me(QString("SIGNAL %1").arg(capturecardnum), slist); 308 326 gContext->dispatch(me); 309 //cerr<<"sent SIGNAL"<<endl;310 327 } 311 328 312 329 usleep(update_rate * 1000); 313 330 } … … void SignalMonitor::SendMessage( 440 457 break; 441 458 case kStatusSignalStrength: 442 459 listener->StatusSignalStrength(val); 443 460 break; 461 case kStatusChannelTuned: 462 listener->StatusChannelTuned(val); 463 break; 444 464 case kStatusSignalToNoise: 445 465 if (dvblistener) 446 466 dvblistener->StatusSignalToNoise(val); 447 467 break; … … void SignalMonitor::SendMessage( 460 480 } 461 481 } 462 482 } 463 483 484 bool SignalMonitor::IsChannelTuned(void) 485 { 486 if (is_tuned) 487 return true; 488 489 ChannelBase::Status status = channel->GetStatus(); 490 QMutexLocker locker(&statusLock); 491 492 switch (status) { 493 case ChannelBase::changePending: 494 channelTuned.SetValue(1); 495 break; 496 case ChannelBase::changeFailed: 497 channelTuned.SetValue(2); 498 break; 499 case ChannelBase::changeSuccess: 500 channelTuned.SetValue(3); 501 break; 502 } 503 504 EmitStatus(); 505 506 if (status == ChannelBase::changeSuccess) 507 { 508 if (tablemon) 509 pParent->SetupDTVSignalMonitor(eit_scan); 510 511 is_tuned = true; 512 return true; 513 } 514 515 return false; 516 } 517 464 518 void SignalMonitor::SendMessageAllGood(void) 465 519 { 466 520 QMutexLocker locker(&listenerLock); 467 521 for (uint i = 0; i < listeners.size(); i++) … … void SignalMonitor::SendMessageAllGood(v 469 523 } 470 524 471 525 void SignalMonitor::EmitStatus(void) 472 526 { 527 SendMessage(kStatusChannelTuned, channelTuned); 473 528 SendMessage(kStatusSignalLock, signalLock); 474 529 if (HasFlags(kSigMon_WaitForSig)) 475 530 SendMessage(kStatusSignalStrength, signalStrength); 476 531 } -
libs/libmythtv/signalmonitor.h
old new using namespace std; 26 26 "SM("<<channel->GetDevice()<<")::"<<FUNC<<": "<<MSG); 27 27 28 28 inline QString sm_flags_to_string(uint64_t); 29 29 30 class TVRec; 31 30 32 class SignalMonitor 31 33 { 32 34 public: 33 35 /// Returns true iff the card type supports signal monitoring. … … class SignalMonitor 39 41 40 42 // // // // // // // // // // // // // // // // // // // // // // // // 41 43 // Control // // // // // // // // // // // // // // // // // // // // 42 44 43 virtual void Start( );45 virtual void Start(bool waitfor_tune); 44 46 virtual void Stop(); 45 47 virtual void Kick(); 46 48 virtual bool WaitForLock(int timeout = -1); 47 49 … … class SignalMonitor 83 85 * otherwise they are not. 84 86 */ 85 87 void SetNotifyFrontend(bool notify) { notify_frontend = notify; } 86 88 89 /** \brief Indicate if table monitoring is needed 90 * \param monitor if true parent->SetupDTVSignalMonitor is called 91 * after the channel is tuned. 92 */ 93 void SetMonitoring(TVRec * parent, bool EITscan, bool monitor) 94 { pParent = parent; eit_scan = EITscan, tablemon = monitor; } 95 87 96 /** \brief Sets the number of milliseconds between signal monitoring 88 97 * attempts in the signal monitoring thread. 89 98 * 90 99 * Defaults to 25 milliseconds. … … class SignalMonitor 96 105 // // // // // // // // // // // // // // // // // // // // // // // // 97 106 // Listeners // // // // // // // // // // // // // // // // // // // 98 107 void AddListener(SignalMonitorListener *listener); 99 108 void RemoveListener(SignalMonitorListener *listener); 109 100 110 void SendMessage(SignalMonitorMessageType type, 101 111 const SignalMonitorValue &val); 102 112 void SendMessageAllGood(void); 103 113 virtual void EmitStatus(void); … … class SignalMonitor 108 118 109 119 static void* SpawnMonitorLoop(void*); 110 120 virtual void MonitorLoop(); 111 121 122 bool IsChannelTuned(void); 123 112 124 /// \brief This should be overridden to actually do signal monitoring. 113 125 virtual void UpdateValues() { ; } 114 126 115 127 public: … … class SignalMonitor 139 151 static const uint64_t kFWSigMon_PowerSeen = 0x0000000100ULL; 140 152 /// We've seen something indicating whether the data stream is encrypted 141 153 static const uint64_t kDTVSigMon_CryptSeen = 0x0000000200ULL; 142 154 155 static const uint64_t kSigMon_Tuned = 0x0000000400ULL; 156 143 157 /// We've seen a PAT matching our requirements 144 158 static const uint64_t kDTVSigMon_PATMatch = 0x0000001000ULL; 145 159 /// We've seen a PMT matching our requirements 146 160 static const uint64_t kDTVSigMon_PMTMatch = 0x0000002000ULL; … … class SignalMonitor 184 198 185 199 protected: 186 200 pthread_t monitor_thread; 187 201 ChannelBase *channel; 202 TVRec *pParent; 188 203 int capturecardnum; 189 204 uint64_t flags; 190 205 int update_rate; 191 206 uint minimum_update_rate; 192 207 bool running; 193 208 bool exit; 194 209 bool update_done; 195 210 bool notify_frontend; 211 bool is_tuned; 212 bool tablemon; 213 bool eit_scan; 196 214 QString error; 197 215 198 216 SignalMonitorValue signalLock; 199 217 SignalMonitorValue signalStrength; 218 SignalMonitorValue channelTuned; 200 219 201 220 vector<SignalMonitorListener*> listeners; 202 221 203 222 QMutex startStopLock; -
libs/libmythtv/signalmonitorlistener.h
old new 8 8 #include "signalmonitorvalue.h" 9 9 10 10 typedef enum { 11 11 kAllGood, 12 kStatusChannelTuned, 12 13 kStatusSignalLock, 13 14 kStatusSignalStrength, 14 15 kStatusSignalToNoise, 15 16 kStatusBitErrorRate, … … class MPUBLIC SignalMonitorListener 29 30 * has been started. 30 31 */ 31 32 virtual void AllGood(void) = 0; 32 33 34 /** \brief Singal to be sent with change change status. 35 * 36 * Note: Signals are only sent once the monitoring thread 37 * has been started. 38 */ 39 virtual void StatusChannelTuned(const SignalMonitorValue&) = 0; 40 33 41 /** \brief Signal to be sent as true when it is safe to begin 34 42 * or continue recording, and false if it may not be safe. 35 43 * 36 44 * Note: Signals are only sent once the monitoring thread -
libs/libmythtv/tv_play.cpp
old new void TV::UpdateOSDSignal(const PlayerCon 7160 7160 uint sig = 0; 7161 7161 float snr = 0.0f; 7162 7162 uint ber = 0xffffffff; 7163 7163 int pos = -1; 7164 int tuned = -1; 7164 7165 QString pat(""), pmt(""), mgt(""), vct(""), nit(""), sdt(""), crypt(""); 7165 7166 QString err = QString::null, msg = QString::null; 7166 7167 for (it = slist.begin(); it != slist.end(); ++it) 7167 7168 { … … void TV::UpdateOSDSignal(const PlayerCon 7186 7187 else if ("ber" == it->GetShortName()) 7187 7188 ber = it->GetValue(); 7188 7189 else if ("pos" == it->GetShortName()) 7189 7190 pos = it->GetValue(); 7191 else if ("tuned" == it->GetShortName()) 7192 tuned = it->GetValue(); 7190 7193 else if ("seen_pat" == it->GetShortName()) 7191 7194 pat = it->IsGood() ? "a" : "_"; 7192 7195 else if ("matching_pat" == it->GetShortName()) 7193 7196 pat = it->IsGood() ? "A" : pat; … … void TV::UpdateOSDSignal(const PlayerCon 7219 7222 if (sig) 7220 7223 infoMap["signal"] = QString::number(sig); // use normalized value 7221 7224 7222 7225 bool allGood = SignalMonitorValue::AllGood(slist); 7226 char tuneCode; 7223 7227 QString slock = ("1" == infoMap["slock"]) ? "L" : "l"; 7224 7228 QString lockMsg = (slock=="L") ? tr("Partial Lock") : tr("No Lock"); 7225 7229 QString sigMsg = allGood ? tr("Lock") : lockMsg; 7226 7230 … … void TV::UpdateOSDSignal(const PlayerCon 7231 7235 sigDesc += " | " + tr("BE %1", "Bit Errors").arg(ber, 2); 7232 7236 if ((pos >= 0) && (pos < 100)) 7233 7237 sigDesc += " | " + tr("Rotor %1\%").arg(pos,2); 7234 7238 7235 sigDesc = sigDesc + QString(" | (%1%2%3%4%5%6%7%8) %9") 7236 .arg(slock).arg(pat).arg(pmt).arg(mgt).arg(vct) 7237 .arg(nit).arg(sdt).arg(crypt).arg(sigMsg); 7239 if (tuned == 1) 7240 tuneCode = 't'; 7241 else if (tuned == 2) 7242 tuneCode = 'F'; 7243 else if (tuned == 3) 7244 tuneCode = 'T'; 7245 else 7246 tuneCode = '_'; 7247 7248 sigDesc = sigDesc + QString(" | (%1%2%3%4%5%6%7%8%9) %10") 7249 .arg(tuneCode).arg(slock).arg(pat).arg(pmt).arg(mgt).arg(vct) 7250 .arg(nit).arg(sdt).arg(crypt).arg(sigMsg); 7238 7251 7239 7252 if (!err.isEmpty()) 7240 7253 sigDesc = err; 7241 7254 else if (!msg.isEmpty()) -
libs/libmythtv/tv_rec.cpp
old new ProgramInfo *TVRec::GetRecording(void) 377 377 */ 378 378 void TVRec::RecordPending(const ProgramInfo *rcinfo, int secsleft, 379 379 bool hasLater) 380 380 { 381 QMutexLocker lock(&stateChangeLock); 381 QMutexLocker statelock(&stateChangeLock); 382 QMutexLocker pendlock(&pendingRecLock); 382 383 383 384 if (secsleft < 0) 384 385 { 385 386 VERBOSE(VB_RECORD, LOC + "Pending recording revoked on " + … … void TVRec::RecordPending(const ProgramI 415 416 rcinfo->inputid, cardid); 416 417 417 418 pendingRecordings[rcinfo->cardid].possibleConflicts = cardids; 418 419 419 state ChangeLock.unlock();420 statelock.unlock(); 420 421 for (uint i = 0; i < cardids.size(); i++) 421 422 RemoteRecordPending(cardids[i], rcinfo, secsleft, hasLater); 422 state ChangeLock.lock();423 statelock.relock(); 423 424 } 424 425 425 426 /** \fn TVRec::SetPseudoLiveTVRecording(ProgramInfo*) 426 427 * \brief Sets the pseudo LiveTV ProgramInfo … … QDateTime TVRec::GetRecordEndTime(const 450 451 * TV::AskAllowRecording(const QStringList&, int, bool) 451 452 */ 452 453 void TVRec::CancelNextRecording(bool cancel) 453 454 { 455 QMutexLocker pendlock(&pendingRecLock); 454 456 VERBOSE(VB_RECORD, LOC + "CancelNextRecording("<<cancel<<") -- begin"); 455 457 456 458 PendingMap::iterator it = pendingRecordings.find(cardid); 457 459 if (it == pendingRecordings.end()) … … RecStatusType TVRec::StartRecording(cons 534 536 retval = rsRecording; 535 537 return retval; 536 538 } 537 539 538 PendingMap::iterator it = pendingRecordings.find(cardid);539 540 bool cancelNext = false; 541 bool has_pending; 542 543 pendingRecLock.lock(); 544 PendingMap::iterator it = pendingRecordings.find(cardid); 540 545 if (it != pendingRecordings.end()) 541 546 { 542 547 (*it).ask = (*it).doNotAsk = false; 543 548 cancelNext = (*it).canceled; 549 has_pending = true; 544 550 } 551 else 552 has_pending = false; 553 554 PendingInfo pendinfo = *it; 555 pendingRecLock.unlock(); 545 556 546 557 // Flush out events... 547 558 WaitForEventThreadSleep(); 548 559 549 560 // If the needed input is in a shared input group, and we are 550 561 // not canceling the recording anyway, check other recorders 551 if (!cancelNext && 552 (it != pendingRecordings.end()) && (*it).possibleConflicts.size()) 562 if (!cancelNext && has_pending && pendinfo.possibleConflicts.size()) 553 563 { 554 564 VERBOSE(VB_RECORD, LOC + "Checking input group recorders - begin"); 555 vector<uint> &cardids = (*it).possibleConflicts;565 vector<uint> &cardids = pendinfo.possibleConflicts; 556 566 557 567 uint mplexid = 0, sourceid = 0; 558 568 vector<uint> cardids2; 559 569 vector<TVState> states; … … RecStatusType TVRec::StartRecording(cons 574 584 } 575 585 576 586 if (is_busy && !sourceid) 577 587 { 578 mplexid = (*it).info->GetMplexID();579 sourceid = (*it).info->sourceid;588 mplexid = pendinfo.info->GetMplexID(); 589 sourceid = pendinfo.info->sourceid; 580 590 } 581 591 582 592 if (is_busy && 583 593 ((sourceid != busy_input.sourceid) || … … void TVRec::HandleStateChange(void) 961 971 */ 962 972 void TVRec::ChangeState(TVState nextState) 963 973 { 964 974 QMutexLocker lock(&stateChangeLock); 965 966 975 desiredNextState = nextState; 967 976 changeState = true; 968 977 WakeEventLoop(); 969 978 } … … void TVRec::RunTV(void) 1446 1455 { 1447 1456 QDateTime now = QDateTime::currentDateTime(); 1448 1457 bool has_finish = HasFlags(kFlagFinishRecording); 1449 1458 bool has_rec = pseudoLiveTVRecording; 1459 bool enable_ui = true; 1460 1461 pendingRecLock.lock(); 1450 1462 bool rec_soon = 1451 1463 pendingRecordings.find(cardid) != pendingRecordings.end(); 1452 bool enable_ui = true;1464 pendingRecLock.unlock(); 1453 1465 1454 1466 if (has_rec && (has_finish || (now > recordEndTime))) 1455 1467 { 1456 1468 if (pseudoLiveTVRecording && curRecording) … … bool TVRec::WaitForEventThreadSleep(bool 1619 1631 } 1620 1632 1621 1633 void TVRec::HandlePendingRecordings(void) 1622 1634 { 1635 QMutexLocker pendlock(&pendingRecLock); 1636 1623 1637 if (pendingRecordings.empty()) 1624 1638 return; 1625 1639 1626 1640 // If we have a pending recording and AskAllowRecording … … bool ApplyCachedPids(DTVSignalMonitor *d 1920 1934 * 1921 1935 * This method also grabs the ATSCStreamData() from the recorder 1922 1936 * if possible, or creates one if needed. 1923 1937 */ 1924 bool TVRec::SetupDTVSignalMonitor( void)1938 bool TVRec::SetupDTVSignalMonitor(bool EITscan) 1925 1939 { 1926 1940 VERBOSE(VB_RECORD, LOC + "Setting up table monitoring."); 1927 1941 1928 1942 DTVSignalMonitor *sm = GetDTVSignalMonitor(); … … bool TVRec::SetupDTVSignalMonitor(void) 2054 2068 SignalMonitor::kDTVSigMon_WaitForPMT | 2055 2069 SignalMonitor::kDVBSigMon_WaitForPos); 2056 2070 sm->SetRotorTarget(1.0f); 2057 2071 2072 if (EITscan) 2073 { 2074 sm->GetStreamData()->SetVideoStreamsRequired(0); 2075 sm->IgnoreEncrypted(true); 2076 } 2077 2058 2078 VERBOSE(VB_RECORD, LOC + "Successfully set up MPEG table monitoring."); 2059 2079 return true; 2060 2080 } 2061 2081 … … bool TVRec::SetupDTVSignalMonitor(void) 2075 2095 * \param tablemon If set we enable table monitoring 2076 2096 * \param notify If set we notify the frontend of the signal values 2077 2097 * \return true on success, false on failure 2078 2098 */ 2079 bool TVRec::SetupSignalMonitor(bool tablemon, bool notify)2099 bool TVRec::SetupSignalMonitor(bool tablemon, bool EITscan, bool notify) 2080 2100 { 2081 2101 VERBOSE(VB_RECORD, LOC + "SetupSignalMonitor(" 2082 2102 <<tablemon<<", "<<notify<<")"); 2083 2103 … … bool TVRec::SetupSignalMonitor(bool tabl 2091 2111 2092 2112 // make sure statics are initialized 2093 2113 SignalMonitorValue::Init(); 2094 2114 2095 if (SignalMonitor::IsSupported(genOpt.cardtype) && channel->Open()) 2096 signalMonitor = SignalMonitor::Init(genOpt.cardtype, cardid, channel); 2115 if (channel->Open()) 2116 signalMonitor = SignalMonitor::Init(genOpt.cardtype, cardid, 2117 channel); 2097 2118 2098 2119 if (signalMonitor) 2099 2120 { 2100 2121 VERBOSE(VB_RECORD, LOC + "Signal monitor successfully created"); 2101 // If this is a monitor for Digital TV, initialize table monitors2102 if (GetDTVSignalMonitor() && tablemon && !SetupDTVSignalMonitor())2103 {2104 VERBOSE(VB_IMPORTANT, LOC_ERR +2105 "Failed to setup digital signal monitoring");2106 2107 return false;2108 }2109 2122 2123 signalMonitor->SetMonitoring(this, EITscan, 2124 GetDTVSignalMonitor() && tablemon); 2110 2125 signalMonitor->AddListener(this); 2111 2126 signalMonitor->SetUpdateRate(kSignalMonitoringRate); 2112 2127 signalMonitor->SetNotifyFrontend(notify); 2113 2128 2114 2129 // Start the monitoring thread 2115 signalMonitor->Start( );2130 signalMonitor->Start(true); 2116 2131 } 2117 2132 2118 2133 return true; 2119 2134 } … … bool TVRec::CheckChannelPrefix(const QSt 2383 2398 for (uint i = 0; i < 2; i++) 2384 2399 { 2385 2400 for (uint j = 0; j < kSpacerListSize; j++) 2386 2401 { 2387 2402 QString qprefix = add_spacer( 2388 2403 prefix, (QString(spacers[j]) == "_") ? "\\_" : spacers[j]); 2389 2404 query.prepare(basequery.arg(qprefix) + cardquery[i]); 2390 2405 2391 2406 if (!query.exec() || !query.isActive()) … … bool TVRec::IsReallyRecording(void) 2516 2531 * \sa EncoderLink::IsBusy(TunedInputInfo*, int time_buffer) 2517 2532 */ 2518 2533 bool TVRec::IsBusy(TunedInputInfo *busy_input, int time_buffer) const 2519 2534 { 2520 QMutexLocker lock(&stateChangeLock);2521 2522 2535 TunedInputInfo dummy; 2523 2536 if (!busy_input) 2524 2537 busy_input = &dummy; 2525 2538 … … bool TVRec::IsBusy(TunedInputInfo *busy_ 2539 2552 busy_input->inputid = channel->GetCurrentInputNum(); 2540 2553 chanid = channel->GetChanID(); 2541 2554 } 2542 2555 2556 QMutexLocker pendlock(&pendingRecLock); 2543 2557 PendingMap::const_iterator it = pendingRecordings.find(cardid); 2544 2558 if (!busy_input->inputid && (it != pendingRecordings.end())) 2545 2559 { 2546 2560 int timeLeft = QDateTime::currentDateTime() … … void TVRec::GetNextProgram(int direction 3221 3235 compare = "<"; 3222 3236 } 3223 3237 else if (BROWSE_RIGHT == direction) 3224 3238 { 3225 3239 chanid = channel->GetNextChannel(channum, CHANNEL_DIRECTION_SAME); 3226 3240 compare = ">"; 3227 3241 sortorder = "asc"; 3228 3242 } 3229 3243 } … … void TVRec::TuningShutdowns(const Tuning 3711 3725 */ 3712 3726 void TVRec::TuningFrequency(const TuningRequest &request) 3713 3727 { 3714 3728 DTVChannel *dtvchan = GetDTVChannel(); 3729 3730 bool livetv = request.flags & kFlagLiveTV; 3731 bool antadj = request.flags & kFlagAntennaAdjust; 3732 bool has_dummy = false; 3733 3715 3734 if (dtvchan) 3716 3735 { 3717 3736 MPEGStreamData *mpeg = NULL; 3718 3737 … … void TVRec::TuningFrequency(const Tuning 3727 3746 dtvchan->SetTuningMode(tuningmode); 3728 3747 3729 3748 if (request.minorChan && (tuningmode == "atsc")) 3730 3749 { 3731 channel->SetChannelByString(request.channel); 3732 3750 channel->SelectChannel(request.channel); 3733 3751 ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(mpeg); 3734 3752 if (atsc) 3735 3753 atsc->SetDesiredChannel(request.majorChan, request.minorChan); 3736 3754 } 3737 3755 else if (request.progNum >= 0) 3738 3756 { 3739 channel->SetChannelByString(request.channel); 3740 3757 channel->SelectChannel(request.channel); 3741 3758 if (mpeg) 3742 3759 mpeg->SetDesiredProgram(request.progNum); 3743 3760 } 3744 3761 } … … void TVRec::TuningFrequency(const Tuning 3765 3782 3766 3783 if (channel && !channum.isEmpty()) 3767 3784 { 3768 3785 if (!input.isEmpty()) 3769 ok = channel->SwitchToInput(input, channum);3786 channel->SelectInput(input, channum); 3770 3787 else 3771 ok = channel->SetChannelByString(channum); 3788 channel->SelectChannel(channum); 3789 3790 ok = true; 3772 3791 } 3773 3792 3774 3793 if (!ok) 3775 3794 { … … void TVRec::TuningFrequency(const Tuning 3794 3813 QString("Failed to set channel to %1.").arg(channum)); 3795 3814 } 3796 3815 } 3797 3816 3798 bool livetv = request.flags & kFlagLiveTV; 3799 bool antadj = request.flags & kFlagAntennaAdjust; 3800 bool use_sm = SignalMonitor::IsRequired(genOpt.cardtype); 3801 bool use_dr = use_sm && (livetv || antadj); 3802 bool has_dummy = false; 3803 3804 if (use_dr) 3817 if (livetv || antadj) 3805 3818 { 3806 3819 // We need there to be a ringbuffer for these modes 3807 3820 bool ok; 3808 3821 ProgramInfo *tmp = pseudoLiveTVRecording; … … void TVRec::TuningFrequency(const Tuning 3826 3839 3827 3840 has_dummy = true; 3828 3841 } 3829 3842 3830 // Start signal monitoring for devices capable of monitoring 3831 if (use_sm) 3843 // Start signal (or channel change) monitoring 3844 VERBOSE(VB_RECORD, LOC + "Starting Signal Monitor"); 3845 bool error = false; 3846 if (!SetupSignalMonitor(!antadj, request.flags & kFlagEITScan, 3847 livetv | antadj)) 3832 3848 { 3833 VERBOSE(VB_RECORD, LOC + "Starting Signal Monitor"); 3834 bool error = false; 3835 if (!SetupSignalMonitor(!antadj, livetv | antadj)) 3836 { 3837 VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to setup signal monitor"); 3838 if (signalMonitor) 3839 { 3840 delete signalMonitor; 3841 signalMonitor = NULL; 3842 } 3843 3844 // pretend the signal monitor is running to prevent segfault 3845 SetFlags(kFlagSignalMonitorRunning); 3846 ClearFlags(kFlagWaitingForSignal); 3847 error = true; 3848 } 3849 3849 VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to setup signal monitor"); 3850 3850 if (signalMonitor) 3851 3851 { 3852 if (request.flags & kFlagEITScan) 3853 { 3854 GetDTVSignalMonitor()->GetStreamData()-> 3855 SetVideoStreamsRequired(0); 3856 GetDTVSignalMonitor()->IgnoreEncrypted(true); 3857 } 3858 3859 SetFlags(kFlagSignalMonitorRunning); 3860 ClearFlags(kFlagWaitingForSignal); 3861 if (!antadj) 3862 SetFlags(kFlagWaitingForSignal); 3852 delete signalMonitor; 3853 signalMonitor = NULL; 3863 3854 } 3864 3855 3865 if (has_dummy && ringBuffer) 3866 { 3867 // Make sure recorder doesn't point to bogus ringbuffer before 3868 // it is potentially restarted without a new ringbuffer, if 3869 // the next channel won't tune and the user exits LiveTV. 3870 if (recorder) 3871 recorder->SetRingBuffer(NULL); 3856 // pretend the signal monitor is running to prevent segfault 3857 SetFlags(kFlagSignalMonitorRunning); 3858 ClearFlags(kFlagWaitingForSignal); 3859 error = true; 3860 } 3872 3861 3873 SetFlags(kFlagDummyRecorderRunning); 3874 VERBOSE(VB_RECORD, "DummyDTVRecorder -- started"); 3875 SetFlags(kFlagRingBufferReady); 3876 } 3862 if (signalMonitor) 3863 { 3864 SetFlags(kFlagSignalMonitorRunning); 3865 ClearFlags(kFlagWaitingForSignal); 3866 if (!antadj) 3867 SetFlags(kFlagWaitingForSignal); 3868 } 3877 3869 3878 // if we had problems starting the signal monitor, 3879 // we don't want to start the recorder... 3880 if (error) 3881 return; 3870 if (has_dummy && ringBuffer) 3871 { 3872 // Make sure recorder doesn't point to bogus ringbuffer before 3873 // it is potentially restarted without a new ringbuffer, if 3874 // the next channel won't tune and the user exits LiveTV. 3875 if (recorder) 3876 recorder->SetRingBuffer(NULL); 3877 3878 SetFlags(kFlagDummyRecorderRunning); 3879 VERBOSE(VB_RECORD, "DummyDTVRecorder -- started"); 3880 SetFlags(kFlagRingBufferReady); 3882 3881 } 3883 3882 3883 // if we had problems starting the signal monitor, 3884 // we don't want to start the recorder... 3885 if (error) 3886 return; 3887 3884 3888 // Request a recorder, if the command is a recording command 3885 3889 ClearFlags(kFlagNeedToStartRecorder); 3886 3890 if (request.flags & kFlagRec && !antadj) 3887 3891 SetFlags(kFlagNeedToStartRecorder); -
libs/libmythtv/tv_rec.h
old new typedef QMap<uint,PendingInfo> PendingMa 160 160 161 161 class MPUBLIC TVRec : public SignalMonitorListener 162 162 { 163 163 friend class TuningRequest; 164 friend class SignalMonitor; 164 165 165 166 public: 166 167 TVRec(int capturecardnum); 167 168 ~TVRec(void); … … class MPUBLIC TVRec : public SignalMonit 254 255 255 256 static TVRec *GetTVRec(uint cardid); 256 257 257 258 virtual void AllGood(void) { WakeEventLoop(); } 259 virtual void StatusChannelTuned(const SignalMonitorValue&) { } 258 260 virtual void StatusSignalLock(const SignalMonitorValue&) { } 259 261 virtual void StatusSignalStrength(const SignalMonitorValue&) { } 260 262 261 263 protected: 262 264 void RunTV(void); 263 265 bool WaitForEventThreadSleep(bool wake = true, ulong time = ULONG_MAX); 264 266 static void *EventThread(void *param); 265 267 static void *RecorderThread(void *param); 268 bool SetupDTVSignalMonitor(bool EITscan); 266 269 267 270 private: 268 271 void SetRingBuffer(RingBuffer *); 269 272 void SetPseudoLiveTVRecording(ProgramInfo*); … … class MPUBLIC TVRec : public SignalMonit 293 296 DVBChannel *GetDVBChannel(void); 294 297 FirewireChannel *GetFirewireChannel(void); 295 298 V4LChannel *GetV4LChannel(void); 296 299 297 bool SetupSignalMonitor(bool enable_table_monitoring, bool notify);298 bool SetupDTVSignalMonitor(void);300 bool SetupSignalMonitor(bool enable_table_monitoring, 301 bool EITscan, bool notify); 299 302 void TeardownSignalMonitor(void); 300 303 DTVSignalMonitor *GetDTVSignalMonitor(void); 301 304 302 305 bool HasFlags(uint f) const { return (stateFlags & f) == f; } … … class MPUBLIC TVRec : public SignalMonit 373 376 DBox2DBOptions dboxOpt; 374 377 375 378 // State variables 376 379 mutable QMutex stateChangeLock; 380 mutable QMutex pendingRecLock; 377 381 TVState internalState; 378 382 TVState desiredNextState; 379 383 bool changeState; 380 384 bool pauseNotify; -
libs/libmythtv/v4lchannel.h
old new class V4LChannel : public DTVChannel 48 48 QString GetDevice(void) const { return device; } 49 49 QString GetSIStandard(void) const { return "atsc"; } 50 50 51 51 // Commands 52 bool SwitchToInput(int newcapchannel, bool setstarting);53 52 bool Retune(void); 54 53 55 54 // Picture attributes. 56 55 bool InitPictureAttributes(void); … … class V4LChannel : public DTVChannel 68 67 // Analog scanning stuff 69 68 bool Tune(uint frequency, QString inputname, 70 69 QString modulation, QString si_std); 71 70 71 protected: 72 bool SwitchToInput(int newcapchannel, bool setstarting); 73 72 74 private: 73 75 // Helper Sets 74 76 void SetFreqTable(const int index); 75 77 int SetFreqTable(const QString &name);