Bye bye SoundManager, you are officially obsolete...

libsdl-org · Sep 5, 2009 · 81e592a · 81e592a
1 parent 3580bd7
commit 81e592a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 366 deletions.
diff --git a/configure.in b/configure.in
@@ -2883,8 +2883,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         if test x$enable_audio = xyes; then
             AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
             SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
-            AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR)
-            SOURCES="$SOURCES $srcdir/src/audio/macrom/*.c"
             have_audio=yes
         fi
         # Set up files for the atomic operations library

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -199,7 +199,6 @@
 #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 #undef SDL_AUDIO_DRIVER_PAUDIO
 #undef SDL_AUDIO_DRIVER_QSA
-#undef SDL_AUDIO_DRIVER_SNDMGR
 #undef SDL_AUDIO_DRIVER_SUNAUDIO
 #undef SDL_AUDIO_DRIVER_WINWAVEOUT
 #undef SDL_AUDIO_DRIVER_FUSIONSOUND

diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
@@ -103,7 +103,6 @@
 
 /* Enable various audio drivers */
 #define SDL_AUDIO_DRIVER_COREAUDIO	1
-#define SDL_AUDIO_DRIVER_SNDMGR	1
 #define SDL_AUDIO_DRIVER_DISK	1
 #define SDL_AUDIO_DRIVER_DUMMY	1
 

diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -127,9 +127,6 @@ static const AudioBootStrap *const bootstrap[] = {
 #if SDL_AUDIO_DRIVER_COREAUDIOIPHONE
     &COREAUDIOIPHONE_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_SNDMGR
-    &SNDMGR_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_MINT
     &MINTAUDIO_GSXB_bootstrap,
     &MINTAUDIO_MCSN_bootstrap,

diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c
@@ -22,8 +22,9 @@
 #include "SDL_config.h"
 
 #include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
+#if MAC_OS_X_VERSION_MAX_ALLOWED == 1050
 #include <AudioUnit/AUNTComponent.h>
 #endif
 

diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c