me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jack:

Browse source 
- fixed assertion in PA processor logics by informing processor that host format is non-interleaved (using paNonInterleaved flag) in PaUtil_InitializeBufferProcessor
 - fixed rare timeout on WaitCondition reported earlier by increasing timeout from 1 second to 10 minutes
This commit is contained in:
dmitrykos 2010-07-29 06:29:41 +00:00
commit 60468d02f1
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hostapi/jack/pa_jack.c
View file

@ -1000,7 +1000,7 @@ static PaError WaitCondition( PaJackHostApiRepresentation *hostApi )
PaTime pt = PaUtil_GetTime(); PaTime pt = PaUtil_GetTime();
struct timespec ts; struct timespec ts;
ts.tv_sec = (time_t) floor( pt + 1 ); ts.tv_sec = (time_t) floor( pt + 10 * 60 /* 10 minutes */ );
ts.tv_nsec = (long) ((pt - floor( pt )) * 1000000000); ts.tv_nsec = (long) ((pt - floor( pt )) * 1000000000);
/* XXX: Best enclose in loop, in case of spurious wakeups? */ /* XXX: Best enclose in loop, in case of spurious wakeups? */
err = pthread_cond_timedwait( &hostApi->cond, &hostApi->mtx, &ts ); err = pthread_cond_timedwait( &hostApi->cond, &hostApi->mtx, &ts );
@ -1177,7 +1177,7 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
minimum_buffer_frames = jackHostApi->jack_buffer_size * 3; minimum_buffer_frames = jackHostApi->jack_buffer_size * 3;
/* setup blocking API data structures (FIXME: can fail) */ /* setup blocking API data structures (FIXME: can fail) */
BlockingBegin( stream, minimum_buffer_frames ); BlockingBegin( stream, minimum_buffer_frames );
/* install our own callback for the blocking API */ /* install our own callback for the blocking API */
streamCallback = BlockingCallback; streamCallback = BlockingCallback;
@ -1276,10 +1276,10 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
&stream->bufferProcessor, &stream->bufferProcessor,
inputChannelCount, inputChannelCount,
inputSampleFormat, inputSampleFormat,
paFloat32, /* hostInputSampleFormat */ paFloat32 | paNonInterleaved, /* hostInputSampleFormat */
outputChannelCount, outputChannelCount,
outputSampleFormat, outputSampleFormat,
paFloat32, /* hostOutputSampleFormat */ paFloat32 | paNonInterleaved, /* hostOutputSampleFormat */
jackSr, jackSr,
streamFlags, streamFlags,
framesPerBuffer, framesPerBuffer,