diff options
Diffstat (limited to 'src/audio')
78 files changed, 189 insertions, 539 deletions
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am deleted file mode 100644 index e8a68069..00000000 --- a/src/audio/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ - -## Makefile.am for the SDL audio library - -noinst_LTLIBRARIES = libaudio.la - -# Define which subdirectories need to be built -SUBDIRS = @AUDIO_SUBDIRS@ -DIST_SUBDIRS = \ - alsa \ - arts \ - baudio \ - dc \ - disk \ - dma \ - dmedia \ - dsp \ - esd \ - macosx \ - macrom \ - mint \ - mme \ - nas \ - nto \ - openbsd \ - paudio \ - sun \ - ums \ - windib \ - windx5 - -DRIVERS = @AUDIO_DRIVERS@ - -# Include the architecture-independent sources -COMMON_SRCS = \ - SDL_audio.c \ - SDL_audio_c.h \ - SDL_audiocvt.c \ - SDL_audiodev.c \ - SDL_audiodev_c.h \ - SDL_audiomem.c \ - SDL_audiomem.h \ - SDL_mixer.c \ - SDL_sysaudio.h \ - SDL_wave.c \ - SDL_wave.h \ - SDL_mixer_MMX.c \ - SDL_mixer_MMX.h \ - SDL_mixer_MMX_VC.c \ - SDL_mixer_MMX_VC.h \ - SDL_mixer_m68k.c \ - SDL_mixer_m68k.h - -libaudio_la_SOURCES = $(COMMON_SRCS) -libaudio_la_LIBADD = $(DRIVERS) -libaudio_la_DEPENDENCIES = $(DRIVERS) diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index dc66eb39..3fa5b12d 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -35,76 +35,76 @@ /* Available audio drivers */ static AudioBootStrap *bootstrap[] = { -#ifdef OPENBSD_AUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_OPENBSD &OPENBSD_AUDIO_bootstrap, #endif -#ifdef OSS_SUPPORT +#if SDL_AUDIO_DRIVER_OSS &DSP_bootstrap, &DMA_bootstrap, #endif -#ifdef ALSA_SUPPORT +#if SDL_AUDIO_DRIVER_ALSA &ALSA_bootstrap, #endif -#ifdef QNXNTOAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_QNXNTO &QNXNTOAUDIO_bootstrap, #endif -#ifdef SUNAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_SUNAUDIO &SUNAUDIO_bootstrap, #endif -#ifdef DMEDIA_SUPPORT +#if SDL_AUDIO_DRIVER_DMEDIA &DMEDIA_bootstrap, #endif -#ifdef ARTSC_SUPPORT - &ARTSC_bootstrap, +#if SDL_AUDIO_DRIVER_ARTS + &ARTS_bootstrap, #endif -#ifdef ESD_SUPPORT +#if SDL_AUDIO_DRIVER_ESD &ESD_bootstrap, #endif -#ifdef NAS_SUPPORT +#if SDL_AUDIO_DRIVER_NAS &NAS_bootstrap, #endif -#ifdef ENABLE_DIRECTX +#if SDL_AUDIO_DRIVER_DSOUND &DSOUND_bootstrap, #endif -#ifdef ENABLE_WINDIB +#if SDL_AUDIO_DRIVER_WAVEOUT &WAVEOUT_bootstrap, #endif -#ifdef __BEOS__ +#if SDL_AUDIO_DRIVER_PAUD + &Paud_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_BAUDIO &BAUDIO_bootstrap, #endif -#ifdef MACOSX +#if SDL_AUDIO_DRIVER_COREAUDIO &COREAUDIO_bootstrap, #endif -#if defined(macintosh) || TARGET_API_MAC_CARBON +#if SDL_AUDIO_DRIVER_SNDMGR &SNDMGR_bootstrap, #endif -#ifdef _AIX - &Paud_bootstrap, -#endif -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI &AHI_bootstrap, #endif -#ifdef MMEAUDIO_SUPPORT - &MMEAUDIO_bootstrap, -#endif -#ifdef MINTAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_MINT &MINTAUDIO_GSXB_bootstrap, &MINTAUDIO_MCSN_bootstrap, &MINTAUDIO_STFA_bootstrap, &MINTAUDIO_XBIOS_bootstrap, &MINTAUDIO_DMA8_bootstrap, #endif -#ifdef DISKAUD_SUPPORT +#if SDL_AUDIO_DRIVER_DISK &DISKAUD_bootstrap, #endif -#ifdef ENABLE_DC +#if SDL_AUDIO_DRIVER_DC &DCAUD_bootstrap, #endif -#ifdef DRENDERER_SUPPORT +#if SDL_AUDIO_DRIVER_DRENDERER &DRENDERER_bootstrap, #endif -#ifdef __OS2__ - &DART_bootstrap, +#if SDL_AUDIO_DRIVER_MMEAUDIO + &MMEAUDIO_bootstrap, +#endif +#if SDL_AUDIO_DRIVER_DART + &DART_bootstrap, #endif NULL }; @@ -294,7 +294,7 @@ int SDL_AudioInit(const char *driver_name) /* Select the proper audio driver */ audio = NULL; idx = 0; -#ifdef unix +#if SDL_AUDIO_DRIVER_ESD if ( (driver_name == NULL) && (SDL_getenv("ESPEAKER") != NULL) ) { /* Ahem, we know that if ESPEAKER is set, user probably wants to use ESD, but don't start it if it's not already running. @@ -323,7 +323,7 @@ int SDL_AudioInit(const char *driver_name) } } } -#endif /* unix */ +#endif /* SDL_AUDIO_DRIVER_ESD */ if ( audio == NULL ) { if ( driver_name != NULL ) { #if 0 /* This will be replaced with a better driver selection API */ @@ -414,10 +414,10 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) return(-1); } -#if defined(macintosh) || (defined(__riscos__) && defined(DISABLE_THREADS)) +#if defined(macintosh) || (defined(__riscos__) && SDL_THREADS_DISABLED) /* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */ #else -#if defined(__MINT__) && !defined(ENABLE_THREADS) +#if defined(__MINT__) && SDL_THREADS_DISABLED /* Uses interrupt driven audio, without thread */ #else /* Create a semaphore for locking the sound buffers */ diff --git a/src/audio/SDL_audiomem.c b/src/audio/SDL_audiomem.c deleted file mode 100644 index 03f3cfc5..00000000 --- a/src/audio/SDL_audiomem.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2006 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/* Functions to allocate audio buffer memory, shareable across threads - (necessary because SDL audio emulates threads with fork() - */ - -#ifdef FORK_HACK -#include <sys/types.h> -#include <sys/ipc.h> -#include <sys/shm.h> -#include <stddef.h> -#endif - -#include "SDL_stdinc.h" -#include "SDL_audiomem.h" - -/* Allocate memory that will be shared between threads (freed on exit) */ -void *SDL_AllocAudioMem(int size) -{ - void *chunk; - -#ifdef FORK_HACK - int semid; - - /* Create and get the address of a shared memory segment */ - semid = shmget(IPC_PRIVATE, size, (IPC_CREAT|0600)); - if ( semid < 0 ) { - return(NULL); - } - chunk = shmat(semid, NULL, 0); - - /* Set the segment for deletion when it is detatched */ - shmctl(semid, IPC_RMID, NULL); /* Delets semid if shmat() fails */ -#else - chunk = SDL_malloc(size); -#endif - return((void *)chunk); -} - -void SDL_FreeAudioMem(void *chunk) -{ -#ifdef FORK_HACK - shmdt(chunk); -#else - SDL_free(chunk); -#endif -} diff --git a/src/audio/SDL_audiomem.h b/src/audio/SDL_audiomem.h index ce73d806..a60e2c7d 100644 --- a/src/audio/SDL_audiomem.h +++ b/src/audio/SDL_audiomem.h @@ -20,10 +20,5 @@ slouken@libsdl.org */ -/* Functions to allocate audio buffer memory, shareable across threads - (necessary because SDL audio emulates threads with fork() - */ - -extern void *SDL_AllocAudioMem(int size); -extern void SDL_FreeAudioMem(void *mem); - +#define SDL_AllocAudioMem SDL_malloc +#define SDL_FreeAudioMem SDL_free diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h index 32754e4c..b7e8377d 100644 --- a/src/audio/SDL_sysaudio.h +++ b/src/audio/SDL_sysaudio.h @@ -99,75 +99,75 @@ typedef struct AudioBootStrap { SDL_AudioDevice *(*create)(int devindex); } AudioBootStrap; -#ifdef OPENBSD_AUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_OPENBSD extern AudioBootStrap OPENBSD_AUDIO_bootstrap; #endif -#ifdef OSS_SUPPORT +#if SDL_AUDIO_DRIVER_OSS extern AudioBootStrap DSP_bootstrap; extern AudioBootStrap DMA_bootstrap; #endif -#ifdef ALSA_SUPPORT +#if SDL_AUDIO_DRIVER_ALSA extern AudioBootStrap ALSA_bootstrap; #endif -#ifdef QNXNTOAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_QNXNTO extern AudioBootStrap QNXNTOAUDIO_bootstrap; #endif -#ifdef SUNAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_SUNAUDIO extern AudioBootStrap SUNAUDIO_bootstrap; #endif -#ifdef DMEDIA_SUPPORT +#if SDL_AUDIO_DRIVER_DMEDIA extern AudioBootStrap DMEDIA_bootstrap; #endif -#ifdef ARTSC_SUPPORT -extern AudioBootStrap ARTSC_bootstrap; +#if SDL_AUDIO_DRIVER_ARTS +extern AudioBootStrap ARTS_bootstrap; #endif -#ifdef ESD_SUPPORT +#if SDL_AUDIO_DRIVER_ESD extern AudioBootStrap ESD_bootstrap; #endif -#ifdef NAS_SUPPORT +#if SDL_AUDIO_DRIVER_NAS extern AudioBootStrap NAS_bootstrap; #endif -#ifdef ENABLE_DIRECTX +#if SDL_AUDIO_DRIVER_DSOUND extern AudioBootStrap DSOUND_bootstrap; #endif -#ifdef ENABLE_WINDIB +#if SDL_AUDIO_DRIVER_WAVEOUT extern AudioBootStrap WAVEOUT_bootstrap; #endif -#ifdef _AIX +#if SDL_AUDIO_DRIVER_PAUD extern AudioBootStrap Paud_bootstrap; #endif -#ifdef __BEOS__ +#if SDL_AUDIO_DRIVER_BAUDIO extern AudioBootStrap BAUDIO_bootstrap; #endif -#ifdef MACOSX +#if SDL_AUDIO_DRIVER_COREAUDIO extern AudioBootStrap COREAUDIO_bootstrap; #endif -#if defined(macintosh) || TARGET_API_MAC_CARBON +#if SDL_AUDIO_DRIVER_SNDMGR extern AudioBootStrap SNDMGR_bootstrap; #endif -#ifdef ENABLE_AHI +#if SDL_AUDIO_DRIVER_AHI extern AudioBootStrap AHI_bootstrap; #endif -#ifdef MINTAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_MINT extern AudioBootStrap MINTAUDIO_GSXB_bootstrap; extern AudioBootStrap MINTAUDIO_MCSN_bootstrap; extern AudioBootStrap MINTAUDIO_STFA_bootstrap; extern AudioBootStrap MINTAUDIO_XBIOS_bootstrap; extern AudioBootStrap MINTAUDIO_DMA8_bootstrap; #endif -#ifdef DISKAUD_SUPPORT +#if SDL_AUDIO_DRIVER_DISK extern AudioBootStrap DISKAUD_bootstrap; #endif -#ifdef ENABLE_DC +#if SDL_AUDIO_DRIVER_DC extern AudioBootStrap DCAUD_bootstrap; #endif -#ifdef DRENDERER_SUPPORT +#if SDL_AUDIO_DRIVER_DRENDERER extern AudioBootStrap DRENDERER_bootstrap; #endif -#ifdef MMEAUDIO_SUPPORT +#if SDL_AUDIO_DRIVER_MMEAUDIO extern AudioBootStrap MMEAUDIO_bootstrap; #endif -#ifdef __OS2__ +#if SDL_AUDIO_DRIVER_DART extern AudioBootStrap DART_bootstrap; #endif diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c index f76d78c6..b11759c0 100644 --- a/src/audio/SDL_wave.c +++ b/src/audio/SDL_wave.c @@ -20,8 +20,6 @@ slouken@libsdl.org */ -#ifndef DISABLE_FILE - /* Microsoft WAVE file loading routines */ #include "SDL_audio.h" @@ -590,5 +588,3 @@ static int ReadChunk(SDL_RWops *src, Chunk *chunk) } return(chunk->length); } - -#endif /* ENABLE_FILE */ diff --git a/src/audio/alsa/Makefile.am b/src/audio/alsa/Makefile.am deleted file mode 100644 index 4f30d158..00000000 --- a/src/audio/alsa/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -## Makefile.am for SDL using the ALSA PCM audio API - -noinst_LTLIBRARIES = libaudio_alsa.la -libaudio_alsa_la_SOURCES = $(SRCS) - -alsa_lib = \"@alsa_lib@\" - -# The SDL audio driver sources -SRCS = SDL_alsa_audio.c \ - SDL_alsa_audio.h diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c index 08c7abb7..fc091f57 100644 --- a/src/audio/alsa/SDL_alsa_audio.c +++ b/src/audio/alsa/SDL_alsa_audio.c @@ -27,18 +27,13 @@ #include <sys/types.h> #include <signal.h> /* For kill() */ -#include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" #include "SDL_timer.h" +#include "SDL_audio.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" #include "SDL_alsa_audio.h" -#ifdef ALSA_DYNAMIC -#ifdef USE_DLVSYM -#ifndef __USE_GNU -#define __USE_GNU -#endif -#endif +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #include <dlfcn.h> #include "SDL_name.h" #include "SDL_loadso.h" @@ -60,9 +55,9 @@ static void ALSA_PlayAudio(_THIS); static Uint8 *ALSA_GetAudioBuf(_THIS); static void ALSA_CloseAudio(_THIS); -#ifdef ALSA_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -static const char *alsa_library = ALSA_DYNAMIC; +static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC; static void *alsa_handle = NULL; static int alsa_loaded = 0; @@ -131,7 +126,7 @@ static int LoadALSALibrary(void) { retval = 0; for (i = 0; i < SDL_TABLESIZE(alsa_functions); i++) { /* *alsa_functions[i].func = SDL_LoadFunction(alsa_handle,alsa_functions[i].name);*/ -#ifdef USE_DLVSYM +#if HAVE_DLVSYM *alsa_functions[i].func = dlvsym(alsa_handle,alsa_functions[i].name,"ALSA_0.9"); if (!*alsa_functions[i].func) #endif @@ -156,7 +151,7 @@ static int LoadALSALibrary(void) { return 0; } -#endif /* ALSA_DYNAMIC */ +#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */ static const char *get_audio_device(int channels) { diff --git a/src/audio/alsa/SDL_alsa_audio.h b/src/audio/alsa/SDL_alsa_audio.h index a0a5632c..cbe27dba 100644 --- a/src/audio/alsa/SDL_alsa_audio.h +++ b/src/audio/alsa/SDL_alsa_audio.h @@ -23,11 +23,12 @@ #ifndef _ALSA_PCM_audio_h #define _ALSA_PCM_audio_h -#include "SDL_sysaudio.h" #define ALSA_PCM_OLD_HW_PARAMS_API #define ALSA_PCM_OLD_SW_PARAMS_API #include <alsa/asoundlib.h> +#include "../SDL_sysaudio.h" + /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/amigaos/Makefile.am b/src/audio/amigaos/Makefile.am deleted file mode 100644 index 99d95d8a..00000000 --- a/src/audio/amigaos/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -## Makefile.am for the SDL AmigaOS audio subsystem - -noinst_LTLIBRARIES = libaudio_arch.la - -ARCH_SRCS = SDL_ahiaudio.c SDL_ahiaudio.h - -libaudio_arch_la_SOURCES = $(ARCH_SRCS) diff --git a/src/audio/amigaos/SDL_ahiaudio.c b/src/audio/amigaos/SDL_ahiaudio.c index 0130e66c..a6b5a6ad 100644 --- a/src/audio/amigaos/SDL_ahiaudio.c +++ b/src/audio/amigaos/SDL_ahiaudio.c @@ -23,8 +23,7 @@ /* Allow access to a raw mixing buffer (for AmigaOS) */ #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" +#include "../SDL_audio_c.h" #include "SDL_ahiaudio.h" /* Audio driver functions */ diff --git a/src/audio/amigaos/SDL_ahiaudio.h b/src/audio/amigaos/SDL_ahiaudio.h index fd5c9bd9..c059086c 100644 --- a/src/audio/amigaos/SDL_ahiaudio.h +++ b/src/audio/amigaos/SDL_ahiaudio.h @@ -33,7 +33,8 @@ #include <devices/ahi.h> #include "mydebug.h" -#include "SDL_sysaudio.h" + +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/arts/Makefile.am b/src/audio/arts/Makefile.am deleted file mode 100644 index e0d409ef..00000000 --- a/src/audio/arts/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -## Makefile.am for SDL using the Analog Realtime Synthesizer sound driver - -noinst_LTLIBRARIES = libaudio_arts.la -libaudio_arts_la_SOURCES = $(SRCS) - -arts_lib = \"@arts_lib@\" - -# The SDL audio driver sources -SRCS = SDL_artsaudio.c \ - SDL_artsaudio.h diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c index 68b14ae1..b4e95082 100644 --- a/src/audio/arts/SDL_artsaudio.c +++ b/src/audio/arts/SDL_artsaudio.c @@ -24,12 +24,12 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_artsaudio.h" -#ifdef ARTSC_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else @@ -37,18 +37,18 @@ #endif /* The tag name used by artsc audio */ -#define ARTSC_DRIVER_NAME "arts" +#define ARTS_DRIVER_NAME "arts" /* Audio driver functions */ -static int ARTSC_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void ARTSC_WaitAudio(_THIS); -static void ARTSC_PlayAudio(_THIS); -static Uint8 *ARTSC_GetAudioBuf(_THIS); -static void ARTSC_CloseAudio(_THIS); +static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec); +static void ARTS_WaitAudio(_THIS); +static void ARTS_PlayAudio(_THIS); +static Uint8 *ARTS_GetAudioBuf(_THIS); +static void ARTS_CloseAudio(_THIS); -#ifdef ARTSC_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC -static const char *arts_library = ARTSC_DYNAMIC; +static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC; static void *arts_handle = NULL; static int arts_loaded = 0; @@ -114,7 +114,7 @@ static int LoadARTSLibrary(void) return 0; } -#endif /* ARTSC_DYNAMIC */ +#endif /* SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ /* Audio driver bootstrap functions */ @@ -171,24 +171,24 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex) stream = 0; /* Set the function pointers */ - this->OpenAudio = ARTSC_OpenAudio; - this->WaitAudio = ARTSC_WaitAudio; - this->PlayAudio = ARTSC_PlayAudio; - this->GetAudioBuf = ARTSC_GetAudioBuf; - this->CloseAudio = ARTSC_CloseAudio; + this->OpenAudio = ARTS_OpenAudio; + this->WaitAudio = ARTS_WaitAudio; + this->PlayAudio = ARTS_PlayAudio; + this->GetAudioBuf = ARTS_GetAudioBuf; + this->CloseAudio = ARTS_CloseAudio; this->free = Audio_DeleteDevice; return this; } -AudioBootStrap ARTSC_bootstrap = { - ARTSC_DRIVER_NAME, "Analog Realtime Synthesizer", +AudioBootStrap ARTS_bootstrap = { + ARTS_DRIVER_NAME, "Analog Realtime Synthesizer", Audio_Available, Audio_CreateDevice }; /* This function waits until it is possible to write a full sound buffer */ -static void ARTSC_WaitAudio(_THIS) +static void ARTS_WaitAudio(_THIS) { Sint32 ticks; @@ -211,7 +211,7 @@ static void ARTSC_WaitAudio(_THIS) } } -static void ARTSC_PlayAudio(_THIS) +static void ARTS_PlayAudio(_THIS) { int written; @@ -232,12 +232,12 @@ static void ARTSC_PlayAudio(_THIS) #endif } -static Uint8 *ARTSC_GetAudioBuf(_THIS) +static Uint8 *ARTS_GetAudioBuf(_THIS) { return(mixbuf); } -static void ARTSC_CloseAudio(_THIS) +static void ARTS_CloseAudio(_THIS) { if ( mixbuf != NULL ) { SDL_FreeAudioMem(mixbuf); @@ -250,7 +250,7 @@ static void ARTSC_CloseAudio(_THIS) SDL_NAME(arts_free)(); } -static int ARTSC_OpenAudio(_THIS, SDL_AudioSpec *spec) +static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec) { int bits, frag_spec; Uint16 test_format, format; diff --git a/src/audio/arts/SDL_artsaudio.h b/src/audio/arts/SDL_artsaudio.h index 9e50f21b..114170f9 100644 --- a/src/audio/arts/SDL_artsaudio.h +++ b/src/audio/arts/SDL_artsaudio.h @@ -24,7 +24,8 @@ #define _SDL_artscaudio_h #include <artsc.h> -#include "SDL_sysaudio.h" + +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/baudio/Makefile.am b/src/audio/baudio/Makefile.am deleted file mode 100644 index a98d9d9e..00000000 --- a/src/audio/baudio/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the BeOS BSoundPlayer sound driver - -noinst_LTLIBRARIES = libaudio_baudio.la -libaudio_baudio_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_beaudio.cc \ - SDL_beaudio.h diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc index 29ab97f4..9758bc8a 100644 --- a/src/audio/baudio/SDL_beaudio.cc +++ b/src/audio/baudio/SDL_beaudio.cc @@ -29,9 +29,9 @@ extern "C" { #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_sysaudio.h" -#include "SDL_systhread_c.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" +#include "../../thread/SDL_systhread_c.h" #include "SDL_beaudio.h" diff --git a/src/audio/baudio/SDL_beaudio.h b/src/audio/baudio/SDL_beaudio.h index 1506b67f..5a5e34c8 100644 --- a/src/audio/baudio/SDL_beaudio.h +++ b/src/audio/baudio/SDL_beaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *_this diff --git a/src/audio/dart/SDL_dart.c b/src/audio/dart/SDL_dart.c index f1d3b3e4..00f58ae1 100644 --- a/src/audio/dart/SDL_dart.c +++ b/src/audio/dart/SDL_dart.c @@ -24,7 +24,7 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audio_c.h" +#include "../SDL_audio_c.h" #include "SDL_dart.h" // Buffer states: diff --git a/src/audio/dart/SDL_dart.h b/src/audio/dart/SDL_dart.h index def9b8c5..27a7faa3 100644 --- a/src/audio/dart/SDL_dart.h +++ b/src/audio/dart/SDL_dart.h @@ -23,8 +23,6 @@ #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h -#include "SDL_sysaudio.h" - #define INCL_TYPES #define INCL_DOSSEMAPHORES #define INCL_DOSRESOURCES @@ -37,6 +35,8 @@ #include <os2.h> #include <os2me.h> // DART stuff and MMIO stuff +#include "../SDL_sysaudio.h" + /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *_this diff --git a/src/audio/dc/Makefile.am b/src/audio/dc/Makefile.am deleted file mode 100644 index a5d0e1cf..00000000 --- a/src/audio/dc/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -## Makefile.am for SDL on the Dreamcast console - -noinst_LTLIBRARIES = libaudio_dc.la -libaudio_dc_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_dcaudio.c \ - SDL_dcaudio.h \ - aica.c \ - aica.h diff --git a/src/audio/dc/SDL_dcaudio.c b/src/audio/dc/SDL_dcaudio.c index 41f5efd6..d6327f7f 100644 --- a/src/audio/dc/SDL_dcaudio.c +++ b/src/audio/dc/SDL_dcaudio.c @@ -32,9 +32,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_dcaudio.h" #include "aica.h" diff --git a/src/audio/dc/SDL_dcaudio.h b/src/audio/dc/SDL_dcaudio.h index 58a9291d..b2d66a11 100644 --- a/src/audio/dc/SDL_dcaudio.h +++ b/src/audio/dc/SDL_dcaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_diskaudio_h #define _SDL_diskaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/disk/Makefile.am b/src/audio/disk/Makefile.am deleted file mode 100644 index ab3310a8..00000000 --- a/src/audio/disk/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL audio "driver" that writes to a file. - -noinst_LTLIBRARIES = libaudio_disk.la -libaudio_disk_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_diskaudio.c \ - SDL_diskaudio.h diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c index 6b6af41b..cc5e9a32 100644 --- a/src/audio/disk/SDL_diskaudio.c +++ b/src/audio/disk/SDL_diskaudio.c @@ -37,9 +37,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_diskaudio.h" /* The tag name used by DISK audio */ diff --git a/src/audio/disk/SDL_diskaudio.h b/src/audio/disk/SDL_diskaudio.h index 4a1996bf..7a80bf29 100644 --- a/src/audio/disk/SDL_diskaudio.h +++ b/src/audio/disk/SDL_diskaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_diskaudio_h #define _SDL_diskaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/dma/Makefile.am b/src/audio/dma/Makefile.am deleted file mode 100644 index fa4ce467..00000000 --- a/src/audio/dma/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the OSS /dev/dsp DMA sound driver - -noinst_LTLIBRARIES = libaudio_dma.la -libaudio_dma_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_dmaaudio.c \ - SDL_dmaaudio.h diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c index 6cdb7592..10d4547f 100644 --- a/src/audio/dma/SDL_dmaaudio.c +++ b/src/audio/dma/SDL_dmaaudio.c @@ -33,7 +33,10 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/mman.h> -#ifdef OSS_USE_SOUNDCARD_H + +#include "SDL_config.h" + +#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H /* This is installed on some systems */ #include <soundcard.h> #else @@ -47,9 +50,8 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_dmaaudio.h" /* The tag name used by DMA audio */ diff --git a/src/audio/dma/SDL_dmaaudio.h b/src/audio/dma/SDL_dmaaudio.h index 3174a0e6..f48e7919 100644 --- a/src/audio/dma/SDL_dmaaudio.h +++ b/src/audio/dma/SDL_dmaaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_dspaudio_h #define _SDL_dspaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/dmedia/Makefile.am b/src/audio/dmedia/Makefile.am deleted file mode 100644 index 149385eb..00000000 --- a/src/audio/dmedia/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the IRIX DMedia sound driver - -noinst_LTLIBRARIES = libaudio_dmedia.la -libaudio_dmedia_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_irixaudio.c \ - SDL_irixaudio.h diff --git a/src/audio/dmedia/SDL_irixaudio.c b/src/audio/dmedia/SDL_irixaudio.c index 632ee98c..406a9375 100644 --- a/src/audio/dmedia/SDL_irixaudio.c +++ b/src/audio/dmedia/SDL_irixaudio.c @@ -25,8 +25,8 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" #include "SDL_irixaudio.h" diff --git a/src/audio/dmedia/SDL_irixaudio.h b/src/audio/dmedia/SDL_irixaudio.h index 7e1771ee..dd8df362 100644 --- a/src/audio/dmedia/SDL_irixaudio.h +++ b/src/audio/dmedia/SDL_irixaudio.h @@ -25,7 +25,7 @@ #include <dmedia/audio.h> -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/dsp/Makefile.am b/src/audio/dsp/Makefile.am deleted file mode 100644 index bccca129..00000000 --- a/src/audio/dsp/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the OSS /dev/dsp standard sound driver - -noinst_LTLIBRARIES = libaudio_dsp.la -libaudio_dsp_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_dspaudio.c \ - SDL_dspaudio.h diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c index dd424f54..6804f1c5 100644 --- a/src/audio/dsp/SDL_dspaudio.c +++ b/src/audio/dsp/SDL_dspaudio.c @@ -34,7 +34,10 @@ #include <sys/time.h> #include <sys/ioctl.h> #include <sys/stat.h> -#ifdef OSS_USE_SOUNDCARD_H + +#include "SDL_config.h" + +#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H /* This is installed on some systems */ #include <soundcard.h> #else @@ -44,9 +47,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_dspaudio.h" /* The tag name used by DSP audio */ diff --git a/src/audio/dsp/SDL_dspaudio.h b/src/audio/dsp/SDL_dspaudio.h index cbb7f975..8d62993b 100644 --- a/src/audio/dsp/SDL_dspaudio.h +++ b/src/audio/dsp/SDL_dspaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_dspaudio_h #define _SDL_dspaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/esd/Makefile.am b/src/audio/esd/Makefile.am deleted file mode 100644 index a9ac22e8..00000000 --- a/src/audio/esd/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -## Makefile.am for SDL using the Enlightened Sound Daemon sound driver - -noinst_LTLIBRARIES = libaudio_esd.la -libaudio_esd_la_SOURCES = $(SRCS) - -esd_lib = \"@esd_lib@\" - -# The SDL audio driver sources -SRCS = SDL_esdaudio.c \ - SDL_esdaudio.h diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c index 3445d5b3..bd2d9863 100644 --- a/src/audio/esd/SDL_esdaudio.c +++ b/src/audio/esd/SDL_esdaudio.c @@ -30,12 +30,12 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_esdaudio.h" -#ifdef ESD_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else @@ -52,9 +52,9 @@ static void ESD_PlayAudio(_THIS); static Uint8 *ESD_GetAudioBuf(_THIS); static void ESD_CloseAudio(_THIS); -#ifdef ESD_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC -static const char *esd_library = ESD_DYNAMIC; +static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC; static void *esd_handle = NULL; static int esd_loaded = 0; @@ -112,7 +112,7 @@ static int LoadESDLibrary(void) return 0; } -#endif /* ESD_DYNAMIC */ +#endif /* SDL_AUDIO_DRIVER_ESD_DYNAMIC */ /* Audio driver bootstrap functions */ diff --git a/src/audio/esd/SDL_esdaudio.h b/src/audio/esd/SDL_esdaudio.h index 82a3e214..cdfa0973 100644 --- a/src/audio/esd/SDL_esdaudio.h +++ b/src/audio/esd/SDL_esdaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_esdaudio_h #define _SDL_esdaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/macosx/Makefile.am b/src/audio/macosx/Makefile.am deleted file mode 100644 index 2b71efb8..00000000 --- a/src/audio/macosx/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the Mac OS X CoreAudio driver - -noinst_LTLIBRARIES = libaudio_macosx.la -libaudio_macosx_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_coreaudio.c \ - SDL_coreaudio.h diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c index 1f8e9bd8..425b4898 100644 --- a/src/audio/macosx/SDL_coreaudio.c +++ b/src/audio/macosx/SDL_coreaudio.c @@ -23,9 +23,8 @@ #include <AudioUnit/AudioUnit.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_coreaudio.h" diff --git a/src/audio/macosx/SDL_coreaudio.h b/src/audio/macosx/SDL_coreaudio.h index 4da6f2e1..93080a1f 100644 --- a/src/audio/macosx/SDL_coreaudio.h +++ b/src/audio/macosx/SDL_coreaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_coreaudio_h #define _SDL_coreaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/macrom/Makefile.am b/src/audio/macrom/Makefile.am deleted file mode 100644 index 31ee995c..00000000 --- a/src/audio/macrom/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the MacOS SoundManager audio driver - -noinst_LTLIBRARIES = libaudio_macrom.la -libaudio_macrom_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_romaudio.c \ - SDL_romaudio.h diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c index d88f9f60..f9002e2a 100644 --- a/src/audio/macrom/SDL_romaudio.c +++ b/src/audio/macrom/SDL_romaudio.c @@ -40,9 +40,8 @@ #endif #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_romaudio.h" /* Audio driver functions */ diff --git a/src/audio/macrom/SDL_romaudio.h b/src/audio/macrom/SDL_romaudio.h index 38fe77e9..28296d8d 100644 --- a/src/audio/macrom/SDL_romaudio.h +++ b/src/audio/macrom/SDL_romaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_romaudio_h #define _SDL_romaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* This is Ryan's improved MacOS sound code, with locking support */ #define USE_RYANS_SOUNDCODE diff --git a/src/audio/mint/Makefile.am b/src/audio/mint/Makefile.am deleted file mode 100644 index 21d910d9..00000000 --- a/src/audio/mint/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Makefile.am for SDL using Xbios/Dma/whatever available audio functions - -noinst_LTLIBRARIES = libaudio_mintaudio.la -libaudio_mintaudio_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = \ - SDL_mintaudio.c \ - SDL_mintaudio.h \ - SDL_mintaudio_dma8.c \ - SDL_mintaudio_dma8.h \ - SDL_mintaudio_gsxb.c \ - SDL_mintaudio_gsxb.h \ - SDL_mintaudio_it.S \ - SDL_mintaudio_mcsn.c \ - SDL_mintaudio_mcsn.h \ - SDL_mintaudio_stfa.c \ - SDL_mintaudio_stfa.h \ - SDL_mintaudio_xbios.c diff --git a/src/audio/mint/SDL_mintaudio.h b/src/audio/mint/SDL_mintaudio.h index 3a0d320d..f679124f 100644 --- a/src/audio/mint/SDL_mintaudio.h +++ b/src/audio/mint/SDL_mintaudio.h @@ -29,7 +29,7 @@ #ifndef _SDL_mintaudio_h #define _SDL_mintaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" #include "SDL_mintaudio_stfa.h" /* Hidden "this" pointer for the audio functions */ diff --git a/src/audio/mint/SDL_mintaudio_dma8.c b/src/audio/mint/SDL_mintaudio_dma8.c index f8379d64..2b9fea3a 100644 --- a/src/audio/mint/SDL_mintaudio_dma8.c +++ b/src/audio/mint/SDL_mintaudio_dma8.c @@ -33,9 +33,8 @@ #include <mint/cookie.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_atarimxalloc_c.h" diff --git a/src/audio/mint/SDL_mintaudio_gsxb.c b/src/audio/mint/SDL_mintaudio_gsxb.c index 4719a5bc..5af835d1 100644 --- a/src/audio/mint/SDL_mintaudio_gsxb.c +++ b/src/audio/mint/SDL_mintaudio_gsxb.c @@ -33,9 +33,8 @@ #include <mint/cookie.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_atarimxalloc_c.h" diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c index c3229ae3..99bcd2c3 100644 --- a/src/audio/mint/SDL_mintaudio_mcsn.c +++ b/src/audio/mint/SDL_mintaudio_mcsn.c @@ -35,9 +35,8 @@ #include <mint/cookie.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_atarimxalloc_c.h" diff --git a/src/audio/mint/SDL_mintaudio_stfa.c b/src/audio/mint/SDL_mintaudio_stfa.c index ab905edf..65a9e844 100644 --- a/src/audio/mint/SDL_mintaudio_stfa.c +++ b/src/audio/mint/SDL_mintaudio_stfa.c @@ -33,9 +33,8 @@ #include <mint/cookie.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_atarimxalloc_c.h" @@ -161,8 +160,8 @@ static void Mint_LockAudio(_THIS) /* Stop replay */ oldpile=(void *)Super(0); - cookie_stfa->sound_enable=STFA_PLAY_DISABLE; - Super(oldpile); + cookie_stfa->sound_enable=STFA_PLAY_SDL_DISABLE; + Super( SDL_arraysize(Super),oldpile); } static void Mint_UnlockAudio(_THIS) diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c index 1b96b43d..89c0afac 100644 --- a/src/audio/mint/SDL_mintaudio_xbios.c +++ b/src/audio/mint/SDL_mintaudio_xbios.c @@ -36,9 +36,8 @@ #include <mint/cookie.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" +#include "../SDL_audio_c.h" +#include "../SDL_sysaudio.h" #include "SDL_atarimxalloc_c.h" diff --git a/src/audio/mme/Makefile.am b/src/audio/mme/Makefile.am deleted file mode 100644 index b5ab2d6d..00000000 --- a/src/audio/mme/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the Tru64 MME sound driver - -noinst_LTLIBRARIES = libaudio_mme.la -libaudio_mme_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_mmeaudio.c \ - SDL_mmeaudio.h diff --git a/src/audio/mme/SDL_mmeaudio.c b/src/audio/mme/SDL_mmeaudio.c index f48b4435..77435905 100644 --- a/src/audio/mme/SDL_mmeaudio.c +++ b/src/audio/mme/SDL_mmeaudio.c @@ -25,8 +25,7 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audio_c.h" - +#include "../SDL_audio_c.h" #include "SDL_mmeaudio.h" static BOOL inUse[NUM_BUFFERS]; diff --git a/src/audio/mme/SDL_mmeaudio.h b/src/audio/mme/SDL_mmeaudio.h index 36e99f59..f589dedb 100644 --- a/src/audio/mme/SDL_mmeaudio.h +++ b/src/audio/mme/SDL_mmeaudio.h @@ -24,7 +24,8 @@ #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h -#include "SDL_sysaudio.h" + +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/nas/Makefile.am b/src/audio/nas/Makefile.am deleted file mode 100644 index abb6f131..00000000 --- a/src/audio/nas/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the Network Audio System sound driver - -noinst_LTLIBRARIES = libaudio_nas.la -libaudio_nas_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_nasaudio.c \ - SDL_nasaudio.h diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c index af4f5922..dd479a74 100644 --- a/src/audio/nas/SDL_nasaudio.c +++ b/src/audio/nas/SDL_nasaudio.c @@ -31,9 +31,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_nasaudio.h" /* The tag name used by artsc audio */ diff --git a/src/audio/nas/SDL_nasaudio.h b/src/audio/nas/SDL_nasaudio.h index 7278d5a5..658ade12 100644 --- a/src/audio/nas/SDL_nasaudio.h +++ b/src/audio/nas/SDL_nasaudio.h @@ -33,7 +33,8 @@ #include <audio/audiolib.h> #endif #include <sys/time.h> -#include "SDL_sysaudio.h" + +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/nto/Makefile.am b/src/audio/nto/Makefile.am deleted file mode 100644 index 3e77c5b7..00000000 --- a/src/audio/nto/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the QNX Neutrino PCM audio API - -noinst_LTLIBRARIES = libaudio_nto.la -libaudio_nto_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_nto_audio.c \ - SDL_nto_audio.h diff --git a/src/audio/nto/SDL_nto_audio.c b/src/audio/nto/SDL_nto_audio.c index fc9982fa..353cac4e 100644 --- a/src/audio/nto/SDL_nto_audio.c +++ b/src/audio/nto/SDL_nto_audio.c @@ -33,8 +33,8 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" #include "SDL_nto_audio.h" /* The tag name used by NTO audio */ diff --git a/src/audio/nto/SDL_nto_audio.h b/src/audio/nto/SDL_nto_audio.h index fcfaf791..967a9372 100644 --- a/src/audio/nto/SDL_nto_audio.h +++ b/src/audio/nto/SDL_nto_audio.h @@ -23,9 +23,10 @@ #ifndef __SDL_NTO_AUDIO_H__ #define __SDL_NTO_AUDIO_H__ -#include "SDL_sysaudio.h" #include <sys/asoundlib.h> +#include "../SDL_sysaudio.h" + /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/openbsd/Makefile.am b/src/audio/openbsd/Makefile.am deleted file mode 100644 index a63b6ecd..00000000 --- a/src/audio/openbsd/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the native OpenBSD sound driver - -noinst_LTLIBRARIES = libaudio_openbsd.la -libaudio_openbsd_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_openbsdaudio.c \ - SDL_openbsdaudio.h diff --git a/src/audio/openbsd/SDL_openbsdaudio.c b/src/audio/openbsd/SDL_openbsdaudio.c index 08cfaf17..1e036b5d 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.c +++ b/src/audio/openbsd/SDL_openbsdaudio.c @@ -36,9 +36,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_openbsdaudio.h" /* The tag name used by OpenBSD audio */ diff --git a/src/audio/openbsd/SDL_openbsdaudio.h b/src/audio/openbsd/SDL_openbsdaudio.h index e7e71cdc..7b3fd1d4 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.h +++ b/src/audio/openbsd/SDL_openbsdaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_openbsdaudio_h #define _SDL_openbsdaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" #define _THIS SDL_AudioDevice *this diff --git a/src/audio/paudio/Makefile.am b/src/audio/paudio/Makefile.am deleted file mode 100644 index be06160c..00000000 --- a/src/audio/paudio/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the AIX PAudio sound driver - -noinst_LTLIBRARIES = libaudio_paudio.la -libaudio_paudio_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_paudio.c \ - SDL_paudio.h diff --git a/src/audio/paudio/SDL_paudio.c b/src/audio/paudio/SDL_paudio.c index ca261c8b..d880908e 100644 --- a/src/audio/paudio/SDL_paudio.c +++ b/src/audio/paudio/SDL_paudio.c @@ -33,9 +33,9 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_paudio.h" #define DEBUG_AUDIO 1 diff --git a/src/audio/paudio/SDL_paudio.h b/src/audio/paudio/SDL_paudio.h index 55f1ed63..f5fa3434 100644 --- a/src/audio/paudio/SDL_paudio.h +++ b/src/audio/paudio/SDL_paudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_paudaudio_h #define _SDL_paudaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/sun/Makefile.am b/src/audio/sun/Makefile.am deleted file mode 100644 index 4321ce0f..00000000 --- a/src/audio/sun/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the UNIX /dev/audio sound driver - -noinst_LTLIBRARIES = libaudio_sun.la -libaudio_sun_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_sunaudio.c \ - SDL_sunaudio.h diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c index e6b961c4..f20bca40 100644 --- a/src/audio/sun/SDL_sunaudio.c +++ b/src/audio/sun/SDL_sunaudio.c @@ -38,10 +38,10 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_sunaudio.h" -#include "SDL_audio_c.h" /* Open the audio device for playback, and don't block if busy */ #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) diff --git a/src/audio/sun/SDL_sunaudio.h b/src/audio/sun/SDL_sunaudio.h index 55317e38..0a174b9c 100644 --- a/src/audio/sun/SDL_sunaudio.h +++ b/src/audio/sun/SDL_sunaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/ums/Makefile.am b/src/audio/ums/Makefile.am deleted file mode 100644 index 479e1ea2..00000000 --- a/src/audio/ums/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the AIX UMS sound driver - -noinst_LTLIBRARIES = libaudio_ums.la -libaudio_ums_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_umsaudio.c \ - SDL_umsaudio.h diff --git a/src/audio/ums/SDL_umsaudio.c b/src/audio/ums/SDL_umsaudio.c index ba88633f..d31684f8 100644 --- a/src/audio/ums/SDL_umsaudio.c +++ b/src/audio/ums/SDL_umsaudio.c @@ -34,8 +34,8 @@ #include <sys/mman.h> #include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiodev_c.h" +#include "../SDL_audio_c.h" +#include "../SDL_audiodev_c.h" #include "SDL_umsaudio.h" /* The tag name used by UMS audio */ diff --git a/src/audio/ums/SDL_umsaudio.h b/src/audio/ums/SDL_umsaudio.h index 298bcf75..c3ceb516 100644 --- a/src/audio/ums/SDL_umsaudio.h +++ b/src/audio/ums/SDL_umsaudio.h @@ -25,10 +25,10 @@ #ifndef _SDL_UMSaudio_h #define _SDL_UMSaudio_h -#include "SDL_sysaudio.h" - #include <UMS/UMSAudioDevice.h> +#include "../SDL_sysaudio.h" + /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/windib/Makefile.am b/src/audio/windib/Makefile.am deleted file mode 100644 index f29e2477..00000000 --- a/src/audio/windib/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -## Makefile.am for SDL using the Win32 WaveOut audio driver - -noinst_LTLIBRARIES = libaudio_windib.la -libaudio_windib_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_dibaudio.c \ - SDL_dibaudio.h diff --git a/src/audio/windib/SDL_dibaudio.c b/src/audio/windib/SDL_dibaudio.c index 4f3acc93..2777f686 100644 --- a/src/audio/windib/SDL_dibaudio.c +++ b/src/audio/windib/SDL_dibaudio.c @@ -27,7 +27,7 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audio_c.h" +#include "../SDL_audio_c.h" #include "SDL_dibaudio.h" #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) #include "win_ce_semaphore.h" diff --git a/src/audio/windib/SDL_dibaudio.h b/src/audio/windib/SDL_dibaudio.h index ed1de51f..3474f254 100644 --- a/src/audio/windib/SDL_dibaudio.h +++ b/src/audio/windib/SDL_dibaudio.h @@ -23,7 +23,7 @@ #ifndef _SDL_lowaudio_h #define _SDL_lowaudio_h -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this diff --git a/src/audio/windx5/Makefile.am b/src/audio/windx5/Makefile.am deleted file mode 100644 index 5e8e5569..00000000 --- a/src/audio/windx5/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -## Makefile.am for SDL using the Win32 DirectX audio driver - -noinst_LTLIBRARIES = libaudio_windx5.la -libaudio_windx5_la_SOURCES = $(SRCS) - -# The SDL audio driver sources -SRCS = SDL_dx5audio.c \ - SDL_dx5audio.h \ - directx.h diff --git a/src/audio/windx5/SDL_dx5audio.c b/src/audio/windx5/SDL_dx5audio.c index 2a64a769..1256fbf6 100644 --- a/src/audio/windx5/SDL_dx5audio.c +++ b/src/audio/windx5/SDL_dx5audio.c @@ -24,7 +24,7 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audio_c.h" +#include "../SDL_audio_c.h" #include "SDL_dx5audio.h" /* Define this if you want to use DirectX 6 DirectSoundNotify interface */ diff --git a/src/audio/windx5/SDL_dx5audio.h b/src/audio/windx5/SDL_dx5audio.h index 51020702..691c1a69 100644 --- a/src/audio/windx5/SDL_dx5audio.h +++ b/src/audio/windx5/SDL_dx5audio.h @@ -25,7 +25,7 @@ #include "directx.h" -#include "SDL_sysaudio.h" +#include "../SDL_sysaudio.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_AudioDevice *this |