Audio subsystem no longer assumes sun audio API on UNIX systems
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40149
This commit is contained in:
parent
f2de3a7f9b
commit
2aca7272f2
5 changed files with 58 additions and 16 deletions
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue