Mercurial > sdl-ios-xcode

diff src/audio/macrom/SDL_romaudio.c @ 3796:b19680c84cdf SDL-ryan-multiple-audio-device

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bunch of 1.3 audio cleanups to remove FIXMEs, get driver specific crap out of the core and into the drivers where it belongs, and push generic responsibilities out of the drivers and into the core where they belong.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 04 Oct 2006 19:54:23 +0000
parents 866c310e2cb5
children c8b3d3d13ed1
line wrap: on
line diff
--- a/src/audio/macrom/SDL_romaudio.c	Wed Oct 04 06:00:10 2006 +0000
+++ b/src/audio/macrom/SDL_romaudio.c	Wed Oct 04 19:54:23 2006 +0000
@@ -70,14 +70,16 @@
 SNDMGR_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
+    impl->DetectDevices = SNDMGR_DetectDevices;
+    impl->GetDeviceName = SNDMGR_GetDeviceName;
     impl->OpenDevice = SNDMGR_OpenDevice;
     impl->CloseDevice = SNDMGR_CloseDevice;
+    impl->ProvidesOwnCallbackThread = 1;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+#ifndef __MACOSX__               /* Mac OS X uses threaded audio, so normal thread code is okay */
     impl->LockDevice = SNDMGR_LockDevice;
     impl->UnlockDevice = SNDMGR_UnlockDevice;
-
-#ifdef __MACOSX__               /* Mac OS X uses threaded audio, so normal thread code is okay */
-    impl->LockDevice = NULL;
-    impl->UnlockDevice = NULL;
 #endif
 
     return 1;
@@ -90,7 +92,6 @@
 
 #pragma options align=power
 
-static volatile int audio_is_opened = 0;
 static volatile SInt32 audio_is_locked = 0;
 static volatile SInt32 need_to_mix = 0;
 
@@ -99,6 +100,7 @@
 static CmpSoundHeader header;
 static volatile Uint32 fill_me = 0;
 
+
 static void
 mix_buffer(SDL_AudioDevice * audio, UInt8 * buffer)
 {
@@ -206,18 +208,6 @@
     int i;
     long initOptions;
 
-    if (audio_is_opened) {
-        SDL_SetError("SoundManager driver doesn't support multiple opens");
-        return 0;
-    }
-
-    if (iscapture) {
-        SDL_SetError("SoundManager driver doesn't support recording");
-        return 0;
-    }
-
-    /* !!! FIXME: ignore devname? */
-
     /* Initialize all variables that we clean on shutdown */
     this->hidden = (struct SDL_PrivateAudioData *)
                         SDL_malloc((sizeof *this->hidden));
@@ -320,14 +310,12 @@
         SndDoCommand(channel, &cmd, 0);
     }
 
-    audio_is_opened = 1;
     return 1;
 }
 
 static void
 SNDMGR_CloseDevice(_THIS)
 {
-
     int i;
 
     running = 0;
@@ -345,7 +333,6 @@
     }
     SDL_free(this->hidden);
     this->hidden = NULL;
-    audio_is_opened = 0;
 }
 
 /* vi: set ts=4 sw=4 expandtab: */