Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-14 15:48:21 +02:00
Code Issues Releases Wiki Activity

Avoid deadlocks that sometimes happened when starting a scrub...

Browse Source
This commit is contained in:
Paul Licameli 2016-05-16 18:22:22 -04:00
commit ceb1a91cb9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/AudioIO.cpp
View File

@ -410,6 +410,14 @@ struct AudioIO::ScrubQueue
return previous.mS1 / mRate; return previous.mS1 / mRate;
} }
// This is for avoiding deadlocks while starting a scrub:
// Audio stream needs to be unblocked
void Nudge()
{
wxMutexLocker locker(mUpdating);
mAvailable.Signal();
}
void PoisonPill() void PoisonPill()
{ {
// Main thread is shutting down the scrubbing // Main thread is shutting down the scrubbing
@ -478,8 +486,7 @@ struct AudioIO::ScrubQueue
} }
else else
{ {
wxASSERT(mPoisoned); // We got the shut-down signal, or we got nudged
// We got the shut-down signal
startSample = endSample = duration = -1L; startSample = endSample = duration = -1L;
} }
} }
@ -1874,8 +1881,11 @@ int AudioIO::StartStream(const WaveTrackArray &playbackTracks,
// FillBuffers will ALWAYS get called from the Audio thread. // FillBuffers will ALWAYS get called from the Audio thread.
mAudioThreadShouldCallFillBuffersOnce = true; mAudioThreadShouldCallFillBuffersOnce = true;
while( mAudioThreadShouldCallFillBuffersOnce == true ) while( mAudioThreadShouldCallFillBuffersOnce == true ) {
if (mScrubQueue)
mScrubQueue->Nudge();
wxMilliSleep( 50 ); wxMilliSleep( 50 );
}
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
// if no playback, reset the midi time to zero to roughly sync // if no playback, reset the midi time to zero to roughly sync