piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Now that Core Audio works, reduce the number of build permutations a bit

Browse Source 
by not linking in other Unix audio modules.
 
Use kAudioUnitSubType_DefaultOutput instead of kAudioUnitSubType_HALOutput
so that a runtime switch to another audio device is automatically handled.
 
Use ERROR_LOG for audio errors.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5562 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-01 20:45:30 +00:00
parent f7494e6b2b
commit 9d7b569ccb
7 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
View File

@ -52,20 +52,20 @@ bool CoreAudioSound::Start()
AudioStreamBasicDescription format;
desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_HALOutput;
desc.componentSubType = kAudioUnitSubType_DefaultOutput;
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
desc.componentManufacturer = kAudioUnitManufacturer_Apple;
Component component = FindNextComponent(NULL, &desc);
if (component == NULL) {
printf("error finding audio component\n");
ERROR_LOG(AUDIO, "error finding audio component");
return false;
}
err = OpenAComponent(component, &audioUnit);
if (err != noErr) {
printf("error opening audio component\n");
ERROR_LOG(AUDIO, "error opening audio component");
return false;
}
@ -82,7 +82,7 @@ bool CoreAudioSound::Start()
kAudioUnitScope_Input, 0, &format,
sizeof(AudioStreamBasicDescription));
if (err != noErr) {
printf("error setting audio format\n");
ERROR_LOG(AUDIO, "error setting audio format");
return false;
}
@ -93,19 +93,19 @@ bool CoreAudioSound::Start()
kAudioUnitScope_Input, 0, &callback_struct,
sizeof callback_struct);
if (err != noErr) {
printf("error setting audio callback\n");
ERROR_LOG(AUDIO, "error setting audio callback");
return false;
}
err = AudioUnitInitialize(audioUnit);
if (err != noErr) {
printf("error initializing audiounit\n");
ERROR_LOG(AUDIO, "error initializing audiounit");
return false;
}
err = AudioOutputUnitStart(audioUnit);
if (err != noErr) {
printf("error starting audiounit\n");
ERROR_LOG(AUDIO, "error starting audiounit");
return false;
}
@ -122,19 +122,19 @@ void CoreAudioSound::Stop()
err = AudioOutputUnitStop(audioUnit);
if (err != noErr) {
printf("error stopping audiounit\n");
ERROR_LOG(AUDIO, "error stopping audiounit");
return;
}
err = AudioUnitUninitialize(audioUnit);
if (err != noErr) {
printf("error uninitializing audiounit\n");
ERROR_LOG(AUDIO, "error uninitializing audiounit");
return;
}
err = CloseComponent(audioUnit);
if (err != noErr) {
printf("error while closing audio component\n");
ERROR_LOG(AUDIO, "error closing audio component");
return;
}
}