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

pa_mac_core.c: Removed some comments. Cleaned up logic.

Browse source
This commit is contained in:
Phil Burk 2016-05-16 22:30:28 -07:00
commit e18ea33d22
2 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2279,7 +2279,6 @@ static OSStatus AudioIOProc( void *inRefCon,
&stream->inputAudioBufferList ); &stream->inputAudioBufferList );
if(err != noErr) if(err != noErr)
{ {
/* We used to assert on error. Now we try to just stop the stream. */
goto stop_stream; goto stop_stream;
} }
@ -2374,7 +2373,6 @@ static OSStatus AudioIOProc( void *inRefCon,
ERR( err ); ERR( err );
if(err != noErr) if(err != noErr)
{ {
/* We used to assert on error. Now we try to just stop the stream. */
goto stop_stream; goto stop_stream;
} }
@ -2486,7 +2484,6 @@ static OSStatus AudioIOProc( void *inRefCon,
ERR( err ); ERR( err );
if(err != noErr) if(err != noErr)
{ {
/* We used to assert on error. Now we try to just stop the stream. */
goto stop_stream; goto stop_stream;
} }
@ -2551,7 +2548,6 @@ static OSStatus AudioIOProc( void *inRefCon,
ERR( err ); ERR( err );
if( err != noErr && err != RING_BUFFER_EMPTY ) if( err != noErr && err != RING_BUFFER_EMPTY )
{ {
/* We used to assert on error. Now we try to just stop the stream. */
goto stop_stream; goto stop_stream;
} }
@ -2577,18 +2573,12 @@ static OSStatus AudioIOProc( void *inRefCon,
} }
} }
switch( callbackResult ) // Should we return successfully or fall through to stopping the stream?
if( callbackResult == paContinue )
{ {
case paContinue:
break;
case paComplete:
case paAbort:
goto stop_stream;
break;
}
PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed ); PaUtil_EndCpuLoadMeasurement( &stream->cpuLoadMeasurer, framesProcessed );
return noErr; return noErr;
}
stop_stream: stop_stream:
stream->state = CALLBACK_STOPPED ; stream->state = CALLBACK_STOPPED ;
@ -2601,7 +2591,6 @@ stop_stream:
return noErr; return noErr;
} }
/* /*
When CloseStream() is called, the multi-api layer ensures that When CloseStream() is called, the multi-api layer ensures that
the stream has already been stopped or aborted. the stream has already been stopped or aborted.