Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-11 22:27:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into scrubbing2

Browse Source
This commit is contained in:
Paul Licameli 2016-06-03 11:07:44 -04:00
commit 82f03dcedf
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AudioIO.cpp
View File

@ -1798,6 +1798,10 @@ int AudioIO::StartStream(const WaveTrackArray &playbackTracks,
if (mListener && captureChannels > 0) if (mListener && captureChannels > 0)
mListener->OnAudioIOStopRecording(); mListener->OnAudioIOStopRecording();
mStreamToken = 0; mStreamToken = 0;
// Don't cause a busy wait in the audio thread after stopping scrubbing
mPlayMode = PLAY_STRAIGHT;
return 0; return 0;
} }
@ -2100,6 +2104,10 @@ void AudioIO::StartStreamCleanup(bool bOnlyBuffers)
mScrubQueue = 0; mScrubQueue = 0;
} }
#endif #endif
// Don't cause a busy wait in the audio thread after stopping scrubbing
mPlayMode = PLAY_STRAIGHT;
} }
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
@ -2530,6 +2538,9 @@ void AudioIO::StopStream()
// Tell UI to hide sample rate // Tell UI to hide sample rate
mListener->OnAudioIORate(0); mListener->OnAudioIORate(0);
} }
// Don't cause a busy wait in the audio thread after stopping scrubbing
mPlayMode = PLAY_STRAIGHT;
} }
void AudioIO::SetPaused(bool state) void AudioIO::SetPaused(bool state)