Audio subsystem no longer assumes sun audio API on UNIX systems

This commit is contained in:
Sam Lantinga
2001-08-09 13:09:47 +00:00
parent ca66996f65
commit ed31df1fd6
5 changed files with 58 additions and 16 deletions

View File

@@ -50,9 +50,11 @@ static AudioBootStrap *bootstrap[] = {
#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,

View File

@@ -109,9 +109,11 @@ extern AudioBootStrap DMA_bootstrap;
#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;

View File

@@ -91,7 +91,7 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
return this;
}
AudioBootStrap AUDIO_bootstrap = {
AudioBootStrap DMEDIA_bootstrap = {
"AL", "IRIX DMedia audio",
Audio_Available, Audio_CreateDevice
};

View File

@@ -117,7 +117,7 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
return this;
}
AudioBootStrap AUDIO_bootstrap = {
AudioBootStrap SUNAUDIO_bootstrap = {
"audio", "UNIX /dev/audio interface",
Audio_Available, Audio_CreateDevice
};