Mercurial > sdl-ios-xcode
diff src/audio/macosx/SDL_coreaudio.c @ 3798:c8b3d3d13ed1 SDL-ryan-multiple-audio-device
Audio bootstraps can now specify that a driver is only to be used if
explicitly requested (for things like the "disk" driver that is always
available but you would never want to default to using).
Trimmed out code that can be handled by stubs in the core. The "dummy" driver
is pretty damned small now. :)
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Wed, 04 Oct 2006 21:27:53 +0000 |
parents | b19680c84cdf |
children | f424927138ff |
line wrap: on
line diff
--- a/src/audio/macosx/SDL_coreaudio.c Wed Oct 04 20:42:39 2006 +0000 +++ b/src/audio/macosx/SDL_coreaudio.c Wed Oct 04 21:27:53 2006 +0000 @@ -218,7 +218,7 @@ static int COREAUDIO_Available(void) { - return (1); + return 1; /* always available on Mac OS X. */ } static int @@ -228,9 +228,6 @@ impl->DetectDevices = COREAUDIO_DetectDevices; impl->GetDeviceName = COREAUDIO_GetDeviceName; impl->OpenDevice = COREAUDIO_OpenDevice; - impl->WaitDevice = COREAUDIO_WaitDevice; - impl->PlayDevice = COREAUDIO_PlayDevice; - impl->GetDeviceBuf = COREAUDIO_GetDeviceBuf; impl->CloseDevice = COREAUDIO_CloseDevice; impl->Deinitialize = COREAUDIO_Deinitialize; impl->ProvidesOwnCallbackThread = 1; @@ -239,7 +236,7 @@ AudioBootStrap COREAUDIO_bootstrap = { "coreaudio", "Mac OS X CoreAudio", - COREAUDIO_Available, COREAUDIO_Init + COREAUDIO_Available, COREAUDIO_Init, 0 }; @@ -355,25 +352,6 @@ } -/* Dummy functions -- we don't use thread-based audio */ -static void -COREAUDIO_WaitDevice(_THIS) -{ - return; -} - -static void -COREAUDIO_PlayDevice(_THIS) -{ - return; -} - -static Uint8 * -COREAUDIO_GetDeviceBuf(_THIS) -{ - return (NULL); -} - static void COREAUDIO_CloseDevice(_THIS) {