Skip to content
Permalink
Browse files

Good idea, renaming OpenBSD audio to BSD audio.

  • Loading branch information
slouken committed Mar 21, 2006
1 parent 1140a00 commit 03c242706c23b00393e3d83d5cdb94f321004d62
@@ -2001,8 +2001,8 @@ case "$host" in
have_audio=yes
;;
netbsd|openbsd)
AC_DEFINE(SDL_AUDIO_DRIVER_OPENBSD)
SOURCES="$SOURCES $srcdir/src/audio/openbsd/*.c"
AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
have_audio=yes
;;
aix)
@@ -167,7 +167,7 @@
#undef SDL_AUDIO_DRIVER_MINT
#undef SDL_AUDIO_DRIVER_MMEAUDIO
#undef SDL_AUDIO_DRIVER_NAS
#undef SDL_AUDIO_DRIVER_OPENBSD
#undef SDL_AUDIO_DRIVER_BSD
#undef SDL_AUDIO_DRIVER_OSS
#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
#undef SDL_AUDIO_DRIVER_PAUD
@@ -36,8 +36,8 @@

/* Available audio drivers */
static AudioBootStrap *bootstrap[] = {
#if SDL_AUDIO_DRIVER_OPENBSD
&OPENBSD_AUDIO_bootstrap,
#if SDL_AUDIO_DRIVER_BSD
&BSD_AUDIO_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_OSS
&DSP_bootstrap,
@@ -23,7 +23,7 @@

/* Get the name of the audio device we use for output */

#if SDL_AUDIO_DRIVER_OPENBSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
#if SDL_AUDIO_DRIVER_BSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO

#include <fcntl.h>
#include <sys/types.h>
@@ -100,8 +100,8 @@ typedef struct AudioBootStrap {
SDL_AudioDevice *(*create)(int devindex);
} AudioBootStrap;

#if SDL_AUDIO_DRIVER_OPENBSD
extern AudioBootStrap OPENBSD_AUDIO_bootstrap;
#if SDL_AUDIO_DRIVER_BSD
extern AudioBootStrap BSD_AUDIO_bootstrap;
#endif
#if SDL_AUDIO_DRIVER_OSS
extern AudioBootStrap DSP_bootstrap;
File renamed without changes.
@@ -22,7 +22,7 @@
#include "SDL_config.h"

/*
* Driver for native OpenBSD audio(4).
* Driver for native OpenBSD/NetBSD audio(4).
* vedge@vedge.com.ar.
*/

@@ -43,10 +43,12 @@
#include "SDL_openbsdaudio.h"

/* The tag name used by NetBSD/OpenBSD audio */
#ifdef __NETBSD__
#define OBSD_DRIVER_NAME "netbsd"
#ifdef __NetBSD__
#define BSD_AUDIO_DRIVER_NAME "netbsd"
#define BSD_AUDIO_DRIVER_DESC "Native NetBSD audio"
#else
#define OBSD_DRIVER_NAME "openbsd"
#define BSD_AUDIO_DRIVER_NAME "openbsd"
#define BSD_AUDIO_DRIVER_DESC "Native OpenBSD audio"
#endif

/* Open the audio device for playback, and don't block if busy */
@@ -132,11 +134,7 @@ static SDL_AudioDevice
}

AudioBootStrap OPENBSD_AUDIO_bootstrap = {
#ifdef __NETBSD__
OBSD_DRIVER_NAME, "Native NetBSD audio",
#else
OBSD_DRIVER_NAME, "Native OpenBSD audio",
#endif
BSD_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC,
Audio_Available, Audio_CreateDevice
};

File renamed without changes.

0 comments on commit 03c2427

Please sign in to comment.