Ticket #8856: StartRecording-WaitForTune.patch
File StartRecording-WaitForTune.patch, 1.7 KB (added by , 14 years ago) |
---|
-
libs/libmythtv/tv_rec.cpp
122 122 stateChangeLock(QMutex::Recursive), 123 123 pendingRecLock(QMutex::Recursive), 124 124 internalState(kState_None), desiredNextState(kState_None), 125 changeState(false), pauseNotify(true),125 changeState(false), m_isTuned(true), pauseNotify(true), 126 126 stateFlags(0), lastTuningRequest(0), 127 127 triggerEventLoopLock(QMutex::NonRecursive), 128 128 triggerEventLoopSignal(false), … … 1618 1618 stateChangeLock.lock(); 1619 1619 1620 1620 // verify that we were triggered. 1621 ok = (tuningRequests.empty() && !changeState);1621 ok = (tuningRequests.empty() && m_isTuned && !changeState); 1622 1622 } 1623 1623 return ok; 1624 1624 } … … 3507 3507 3508 3508 // The dequeue isn't safe to do until now because we 3509 3509 // release the stateChangeLock to teardown a recorder 3510 m_isTuned = false; 3510 3511 tuningRequests.dequeue(); 3511 3512 3512 3513 // Now we start new stuff … … 3542 3543 if (HasFlags(kFlagWaitingForSignal) && !(streamData = TuningSignalCheck())) 3543 3544 return; 3544 3545 3546 m_isTuned = true; 3547 3545 3548 if (HasFlags(kFlagNeedToStartRecorder)) 3546 3549 { 3547 3550 if (recorder) -
libs/libmythtv/tv_rec.h
355 355 TVState internalState; 356 356 TVState desiredNextState; 357 357 bool changeState; 358 bool m_isTuned; 358 359 bool pauseNotify; 359 360 uint stateFlags; 360 361 TuningQueue tuningRequests;