Mercurial > sdl-ios-xcode
changeset 148:8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 09 Aug 2001 13:09:47 +0000 |
| parents | 8f9093e805c9 |
| children | 0e66fd980014 |
| files | configure.in src/audio/SDL_audio.c src/audio/SDL_sysaudio.h src/audio/dmedia/SDL_irixaudio.c src/audio/sun/SDL_sunaudio.c |
| diffstat | 5 files changed, 58 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Thu Aug 09 13:06:32 2001 +0000 +++ b/configure.in Thu Aug 09 13:09:47 2001 +0000 @@ -307,6 +307,29 @@ fi } +dnl Check whether we want to use IRIX 6.5+ native audio or not +CheckDMEDIA() +{ + if test x$enable_audio = xyes; then + AC_MSG_CHECKING(for dmedia audio support) + have_dmedia=no + AC_TRY_COMPILE([ + #include <dmedia/audio.h> + ],[ + ALport audio_port; + ],[ + have_dmedia=yes + ]) + # Set up files for the audio library + if test x$have_dmedia = xyes; then + CFLAGS="$CFLAGS -DDMEDIA_SUPPORT" + AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia" + AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la" + SYSTEM_LIBS="$SYSTEM_LIBS -laudio" + fi + fi +} + dnl Find the ESD includes and libraries CheckESD() { @@ -1203,6 +1226,7 @@ # Set up files for the audio library # We use the OSS and ALSA API's, not the Sun audio API #if test x$enable_audio = xyes; then + # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" #fi @@ -1262,6 +1286,13 @@ CheckPTHREAD # Set up files for the main() stub COPY_ARCH_SRC(src/main, linux, SDL_main.c) + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API + #if test x$enable_audio = xyes; then + # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" + # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" + # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" + #fi # Set up files for the joystick library # (No joystick support yet) if test x$enable_joystick = xyes; then @@ -1310,6 +1341,7 @@ # Set up files for the audio library # We use the OSS and ALSA API's, not the Sun audio API #if test x$enable_audio = xyes; then + # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" #fi @@ -1360,6 +1392,7 @@ COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then + CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -1414,6 +1447,7 @@ # Set up files for the audio library # We use the OSS and native API's, not the Sun audio API #if test x$enable_audio = xyes; then + # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" #fi @@ -1471,6 +1505,7 @@ COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then + CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -1519,6 +1554,7 @@ COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then + CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -1552,6 +1588,8 @@ ARCH=irix CheckDummyVideo CheckDiskAudio + CheckDMEDIA + CheckESD CheckNAS CheckX11 CheckAAlib @@ -1559,12 +1597,12 @@ CheckPTHREAD # Set up files for the main() stub COPY_ARCH_SRC(src/main, linux, SDL_main.c) - # Set up files for the audio library - if test x$enable_audio = xyes; then - AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia" - AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la" - SYSTEM_LIBS="$SYSTEM_LIBS -laudio" - fi + # We use the dmedia audio API, not the Sun audio API + #if test x$enable_audio = xyes; then + # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" + # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" + # AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" + #fi # Set up files for the joystick library # (No joystick support yet) if test x$enable_joystick = xyes; then @@ -1622,6 +1660,7 @@ COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then + CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -1710,6 +1749,7 @@ COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then + CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -1757,8 +1797,6 @@ SYSTEM_LIBS="$SYSTEM_LIBS -lasound" AUDIO_SUBDIRS="$AUDIO_SUBDIRS nto" AUDIO_DRIVERS="$AUDIO_DRIVERS nto/libaudio_nto.la" - AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" - AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi # Set up files for the joystick library if test x$enable_joystick = xyes; then
--- a/src/audio/SDL_audio.c Thu Aug 09 13:06:32 2001 +0000 +++ b/src/audio/SDL_audio.c Thu Aug 09 13:09:47 2001 +0000 @@ -50,9 +50,11 @@ #ifdef ALSA_SUPPORT &ALSA_bootstrap, #endif -#if (defined(unix) && !defined(__CYGWIN32__)) && \ - !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT) - &AUDIO_bootstrap, +#ifdef SUNAUDIO_SUPPORT + &SUNAUDIO_bootstrap, +#endif +#ifdef DMEDIA_SUPPORT + &DMEDIA_bootstrap, #endif #ifdef ARTSC_SUPPORT &ARTSC_bootstrap,
--- a/src/audio/SDL_sysaudio.h Thu Aug 09 13:06:32 2001 +0000 +++ b/src/audio/SDL_sysaudio.h Thu Aug 09 13:09:47 2001 +0000 @@ -109,9 +109,11 @@ #ifdef ALSA_SUPPORT extern AudioBootStrap ALSA_bootstrap; #endif -#if (defined(unix) && !defined(__CYGWIN32__)) && \ - !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT) -extern AudioBootStrap AUDIO_bootstrap; +#ifdef SUNAUDIO_SUPPORT +extern AudioBootStrap SUNAUDIO_bootstrap; +#endif +#ifdef DMEDIA_SUPPORT +extern AudioBootStrap DMEDIA_bootstrap; #endif #ifdef ARTSC_SUPPORT extern AudioBootStrap ARTSC_bootstrap;
--- a/src/audio/dmedia/SDL_irixaudio.c Thu Aug 09 13:06:32 2001 +0000 +++ b/src/audio/dmedia/SDL_irixaudio.c Thu Aug 09 13:09:47 2001 +0000 @@ -91,7 +91,7 @@ return this; } -AudioBootStrap AUDIO_bootstrap = { +AudioBootStrap DMEDIA_bootstrap = { "AL", "IRIX DMedia audio", Audio_Available, Audio_CreateDevice };
--- a/src/audio/sun/SDL_sunaudio.c Thu Aug 09 13:06:32 2001 +0000 +++ b/src/audio/sun/SDL_sunaudio.c Thu Aug 09 13:09:47 2001 +0000 @@ -117,7 +117,7 @@ return this; } -AudioBootStrap AUDIO_bootstrap = { +AudioBootStrap SUNAUDIO_bootstrap = { "audio", "UNIX /dev/audio interface", Audio_Available, Audio_CreateDevice };