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

Update darwin build to use newer core audio frameworks.

Browse source 
Replaced references to core services audio component with equivalent
function calls in the AudioUnit/AudioComponent.h API.
This commit is contained in:
Richard Cartwright 2017-11-09 21:32:10 +00:00
commit 68ce920967
2 changed files with 171 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1173,8 +1173,8 @@ static PaError OpenAndSetupOneAudioUnit(
const double sampleRate,
void *refCon )
{
ComponentDescription desc;
Component comp;
AudioComponentDescription desc;
AudioComponent comp;
/*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
AudioStreamBasicDescription desiredFormat;
OSStatus result = noErr;
@ -1245,7 +1245,7 @@ static PaError OpenAndSetupOneAudioUnit(
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
/* -- find the component -- */
comp = FindNextComponent( NULL, &desc );
comp = AudioComponentFindNext( NULL, &desc );
if( !comp )
{
DBUG( ( "AUHAL component not found." ) );
@ -1254,7 +1254,7 @@ static PaError OpenAndSetupOneAudioUnit(
return paUnanticipatedHostError;
}
/* -- open it -- */
result = OpenAComponent( comp, audioUnit );
result = AudioComponentInstanceNew( comp, audioUnit );
if( result )
{
DBUG( ( "Failed to open AUHAL component." ) );
@ -1607,7 +1607,7 @@ static PaError OpenAndSetupOneAudioUnit(
#undef ERR_WRAP
error:
CloseComponent( *audioUnit );
AudioComponentInstanceDispose( *audioUnit );
*audioUnit = NULL;
if( result )
return PaMacCore_SetError( result, line, 1 );
@ -2645,13 +2645,13 @@ static PaError CloseStream( PaStream* s )
}
if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
AudioUnitUninitialize( stream->outputUnit );
CloseComponent( stream->outputUnit );
AudioComponentInstanceDispose( stream->outputUnit );
}
stream->outputUnit = NULL;
if( stream->inputUnit )
{
AudioUnitUninitialize( stream->inputUnit );
CloseComponent( stream->inputUnit );
AudioComponentInstanceDispose( stream->inputUnit );
stream->inputUnit = NULL;
}
if( stream->inputRingBuffer.buffer )
@ -2711,12 +2711,12 @@ static PaError StartStream( PaStream *s )
// it's not clear from appl's docs that this really waits
// until all data is flushed.
static ComponentResult BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
static OSStatus BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
{
Boolean isRunning = 1;
while( isRunning ) {
UInt32 s = sizeof( isRunning );
ComponentResult err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element, &isRunning, &s );
OSStatus err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element, &isRunning, &s );
if( err )
return err;
Pa_Sleep( 100 );

1
src/hostapi/coreaudio/pa_mac_core_internal.h
View file

@ -62,6 +62,7 @@
#define PA_MAC_CORE_INTERNAL_H__
#include <CoreAudio/CoreAudio.h>
#include <AudioUnit/AudioComponent.h>
#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
#include <AudioToolbox/AudioToolbox.h>