High level now lets user select a specific audio device with an envir…

…onment variable, when the app requested the default device.
libsdl-org · Oct 3, 2006 · 2149666 · 2149666
1 parent 38edc84
commit 2149666
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -572,6 +572,11 @@ open_audio_device(const char *devname, int iscapture,
         return 0;
     }
 
+    /* If app doesn't care about a specific device, let the user override. */
+    if (devname == NULL) {
+        devname = SDL_getenv("SDL_AUDIO_DEVICE_NAME");
+    }
+
     device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof (SDL_AudioDevice));
     if (device == NULL) {
         SDL_OutOfMemory();

diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c
@@ -223,8 +223,11 @@ outputCallback(void *inRefCon,
     UInt32 remaining, len;
     void *ptr;
 
+    /*
+     * !!! FIXME: I'm not sure if you can ever have more than one
+     *            buffer, or what this signifies, or what to do with it...
+     */
     if (ioDataList->mNumberBuffers != 1) {
-        fprintf(stderr, "!!! FIXME SDL!\n");
         return noErr;
     }
 
@@ -406,10 +409,6 @@ prepare_audiounit(_THIS, const char *devname, int iscapture,
     const AudioUnitScope scope = ((iscapture) ? kAudioUnitScope_Output :
                                                 kAudioUnitScope_Input);
 
-    /* !!! FIXME: move something like this to higher level. */
-    if ( (devname == NULL) && (SDL_getenv("SDL_AUDIO_DEVNAME")) )
-        devname = SDL_getenv("SDL_AUDIO_DEVNAME");
-
     if (!find_device_by_name(this, devname, iscapture)) {
         SDL_SetError("Couldn't find requested CoreAudio device");
         return 0;