audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALL OSs: fix race starting play, which inserted leading zero samples

This commit is contained in:
Paul Licameli 2017-09-23 19:33:19 -04:00
parent 771ed7088f
commit 428f543677
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/AudioIO.cpp
View File

@ -2039,12 +2039,30 @@ int AudioIO::StartStream(const ConstWaveTrackArray &playbackTracks,
PaAlsa_EnableRealtimeScheduling( mPortStreamV19, 1 );
#endif
//
// Generate a unique value each time, to be returned to
// clients accessing the AudioIO API, so they can query if they
// are the ones who have reserved AudioIO or not.
//
// It is important to set this before setting the portaudio stream in
// motion -- otherwise it may play an unspecified number of leading
// zeroes.
mStreamToken = (++mNextStreamToken);
// This affects the AudioThread (not the portaudio callback).
// Probably not needed so urgently before portaudio thread start for usual
// playback, since our ring buffers have been primed already with 4 sec
// of audio, but then we might be scrubbing, so do it.
mAudioThreadFillBuffersLoopRunning = true;
// Now start the PortAudio stream!
PaError err;
err = Pa_StartStream( mPortStreamV19 );
if( err != paNoError )
{
mStreamToken = 0;
mAudioThreadFillBuffersLoopRunning = false;
if (mListener && mNumCaptureChannels > 0)
mListener->OnAudioIOStopRecording();
StartStreamCleanup();
@ -2075,18 +2093,9 @@ int AudioIO::StartStream(const ConstWaveTrackArray &playbackTracks,
wxTheApp->ProcessEvent(e);
}
mAudioThreadFillBuffersLoopRunning = true;
// Enable warning popups for unfound aliased blockfiles.
wxGetApp().SetMissingAliasedFileWarningShouldShow(true);
//
// Generate an unique value each time, to be returned to
// clients accessing the AudioIO API, so they can query if
// are the ones who have reserved AudioIO or not.
//
mStreamToken = (++mNextStreamToken);
return mStreamToken;
}