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

pa_mac_core: fix whitespace and missing semicolon

Browse source 
It compiled without the semicolon because it was followed by a VDBUG,
which was followed by a semicolon. The VDBUG was disabled so its
semicolon finished the line above.
This commit is contained in:
Phil Burk 2016-09-24 08:53:28 -07:00
commit 339e875f42
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hostapi/coreaudio/pa_mac_core.c
View file

@ -2789,12 +2789,12 @@ static PaError StopStream( PaStream *s )
/* Tell WriteStream to stop filling the buffer. */ /* Tell WriteStream to stop filling the buffer. */
stream->state = STOPPING; stream->state = STOPPING;
if (stream->userOutChan > 0) /* Does this stream do output? */ if( stream->userOutChan > 0 ) /* Does this stream do output? */
{ {
size_t maxHostFrames = MAX(stream->inputFramesPerBuffer, stream->outputFramesPerBuffer) size_t maxHostFrames = MAX( stream->inputFramesPerBuffer, stream->outputFramesPerBuffer );
VDBUG( ("Waiting for write buffer to be drained.\n") ); VDBUG( ("Waiting for write buffer to be drained.\n") );
paErr = waitUntilBlioWriteBufferIsEmpty( &stream->blio, stream->sampleRate, paErr = waitUntilBlioWriteBufferIsEmpty( &stream->blio, stream->sampleRate,
maxHostFrames); maxHostFrames );
VDBUG( ( "waitUntilBlioWriteBufferIsEmpty returned %d\n", paErr ) ); VDBUG( ( "waitUntilBlioWriteBufferIsEmpty returned %d\n", paErr ) );
} }
return FinishStoppingStream( stream ); return FinishStoppingStream( stream );

5
src/hostapi/coreaudio/pa_mac_core_blocking.c
View file

@ -500,7 +500,7 @@ PaError WriteStream( PaStream* stream,
unsigned long framesRequested ) unsigned long framesRequested )
{ {
PaMacCoreStream *macStream = (PaMacCoreStream*)stream; PaMacCoreStream *macStream = (PaMacCoreStream*)stream;
PaMacBlio *blio = & macStream -> blio; PaMacBlio *blio = &macStream->blio;
char *cbuf = (char *) buffer; char *cbuf = (char *) buffer;
PaError ret = paNoError; PaError ret = paNoError;
VVDBUG(("WriteStream()\n")); VVDBUG(("WriteStream()\n"));
@ -575,7 +575,8 @@ PaError WriteStream( PaStream* stream,
ret = blio->statusFlags & paOutputUnderflow; ret = blio->statusFlags & paOutputUnderflow;
/* report underflow only once: */ /* report underflow only once: */
if( ret ) { if( ret )
{
OSAtomicAnd32( (uint32_t)(~paOutputUnderflow), &blio->statusFlags ); OSAtomicAnd32( (uint32_t)(~paOutputUnderflow), &blio->statusFlags );
ret = paOutputUnderflowed; ret = paOutputUnderflowed;
} }

1
test/patest_write_stop_hang_illegal.c
View file

@ -43,6 +43,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <math.h> #include <math.h>
#include <memory.h> #include <memory.h>
/* pthread may only be available on Mac and Linux. */ /* pthread may only be available on Mac and Linux. */