Good idea, renaming OpenBSD audio to BSD audio.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401571

configure.in

@@ -2001,8 +2001,8 @@ case "$host" in
                 have_audio=yes
             ;;
             netbsd|openbsd)
-                AC_DEFINE(SDL_AUDIO_DRIVER_OPENBSD)
+                AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
-                SOURCES="$SOURCES $srcdir/src/audio/openbsd/*.c"
+                SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
                 have_audio=yes
             ;;
             aix)

include/SDL_config.h.in

@@ -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

src/audio/SDL_audio.c

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

src/audio/SDL_audiodev.c

@@ -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>

src/audio/SDL_sysaudio.h

@@ -100,8 +100,8 @@ typedef struct AudioBootStrap {
 	SDL_AudioDevice *(*create)(int devindex);
 } AudioBootStrap;
 
-#if SDL_AUDIO_DRIVER_OPENBSD
+#if SDL_AUDIO_DRIVER_BSD
-extern AudioBootStrap OPENBSD_AUDIO_bootstrap;
+extern AudioBootStrap BSD_AUDIO_bootstrap;
 #endif
 #if SDL_AUDIO_DRIVER_OSS
 extern AudioBootStrap DSP_bootstrap;

src/audio/bsd/SDL_bsdaudio.c

@@ -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__
+#ifdef __NetBSD__
-#define OBSD_DRIVER_NAME         "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__
+	BSD_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC,
-	OBSD_DRIVER_NAME, "Native NetBSD audio",
-#else
-	OBSD_DRIVER_NAME, "Native OpenBSD audio",
-#endif
 	Audio_Available, Audio_CreateDevice
 };