1.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Thu Aug 04 00:31:11 2011 -0400
     1.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Tue Jul 26 14:18:00 2011 -0700
     1.3 @@ -37,9 +37,6 @@
     1.4  #include "SDL_loadso.h"
     1.5  #endif
     1.6  
     1.7 -/* The tag name used by ALSA audio */
     1.8 -#define DRIVER_NAME         "alsa"
     1.9 -
    1.10  static int (*ALSA_snd_pcm_open)
    1.11    (snd_pcm_t **, const char *, snd_pcm_stream_t, int);
    1.12  static int (*ALSA_snd_pcm_close) (snd_pcm_t * pcm);
    1.13 @@ -684,7 +681,7 @@
    1.14  
    1.15  
    1.16  AudioBootStrap ALSA_bootstrap = {
    1.17 -    DRIVER_NAME, "ALSA PCM audio", ALSA_Init, 0
    1.18 +    "alsa", "ALSA PCM audio", ALSA_Init, 0
    1.19  };
    1.20  
    1.21  /* vi: set ts=4 sw=4 expandtab: */

     2.1 --- a/src/audio/arts/SDL_artsaudio.c	Thu Aug 04 00:31:11 2011 -0400
     2.2 +++ b/src/audio/arts/SDL_artsaudio.c	Tue Jul 26 14:18:00 2011 -0700
     2.3 @@ -41,9 +41,6 @@
     2.4  #define SDL_NAME(X)	X
     2.5  #endif
     2.6  
     2.7 -/* The tag name used by artsc audio */
     2.8 -#define ARTS_DRIVER_NAME         "arts"
     2.9 -
    2.10  #ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
    2.11  
    2.12  static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC;
    2.13 @@ -372,7 +369,7 @@
    2.14  
    2.15  
    2.16  AudioBootStrap ARTS_bootstrap = {
    2.17 -    ARTS_DRIVER_NAME, "Analog RealTime Synthesizer", ARTS_Init, 0
    2.18 +    "arts", "Analog RealTime Synthesizer", ARTS_Init, 0
    2.19  };
    2.20  
    2.21  /* vi: set ts=4 sw=4 expandtab: */

     3.1 --- a/src/audio/bsd/SDL_bsdaudio.c	Thu Aug 04 00:31:11 2011 -0400
     3.2 +++ b/src/audio/bsd/SDL_bsdaudio.c	Tue Jul 26 14:18:00 2011 -0700
     3.3 @@ -41,15 +41,6 @@
     3.4  #include "../SDL_audiodev_c.h"
     3.5  #include "SDL_bsdaudio.h"
     3.6  
     3.7 -/* The tag name used by NetBSD/OpenBSD audio */
     3.8 -#ifdef __NetBSD__
     3.9 -#define BSD_AUDIO_DRIVER_NAME         "netbsd"
    3.10 -#define BSD_AUDIO_DRIVER_DESC         "Native NetBSD audio"
    3.11 -#else
    3.12 -#define BSD_AUDIO_DRIVER_NAME         "openbsd"
    3.13 -#define BSD_AUDIO_DRIVER_DESC         "Native OpenBSD audio"
    3.14 -#endif
    3.15 -
    3.16  /* Use timer for synchronization */
    3.17  /* #define USE_TIMER_SYNC */
    3.18  
    3.19 @@ -377,7 +368,7 @@
    3.20  
    3.21  
    3.22  AudioBootStrap BSD_AUDIO_bootstrap = {
    3.23 -    BSD_AUDIO_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC, BSDAUDIO_Init, 0
    3.24 +    "bsd", "BSD audio", BSDAUDIO_Init, 0
    3.25  };
    3.26  
    3.27  /* vi: set ts=4 sw=4 expandtab: */

     4.1 --- a/src/audio/disk/SDL_diskaudio.c	Thu Aug 04 00:31:11 2011 -0400
     4.2 +++ b/src/audio/disk/SDL_diskaudio.c	Tue Jul 26 14:18:00 2011 -0700
     4.3 @@ -33,9 +33,6 @@
     4.4  #include "../SDL_audio_c.h"
     4.5  #include "SDL_diskaudio.h"
     4.6  
     4.7 -/* The tag name used by DISK audio */
     4.8 -#define DISKAUD_DRIVER_NAME         "disk"
     4.9 -
    4.10  /* environment variables and defaults. */
    4.11  #define DISKENVR_OUTFILE         "SDL_DISKAUDIOFILE"
    4.12  #define DISKDEFAULT_OUTFILE      "sdlaudio.raw"
    4.13 @@ -159,7 +156,7 @@
    4.14  }
    4.15  
    4.16  AudioBootStrap DISKAUD_bootstrap = {
    4.17 -    DISKAUD_DRIVER_NAME, "direct-to-disk audio", DISKAUD_Init, 1
    4.18 +    "disk", "direct-to-disk audio", DISKAUD_Init, 1
    4.19  };
    4.20  
    4.21  /* vi: set ts=4 sw=4 expandtab: */

     5.1 --- a/src/audio/dsp/SDL_dspaudio.c	Thu Aug 04 00:31:11 2011 -0400
     5.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Tue Jul 26 14:18:00 2011 -0700
     5.3 @@ -47,9 +47,6 @@
     5.4  #include "../SDL_audiodev_c.h"
     5.5  #include "SDL_dspaudio.h"
     5.6  
     5.7 -/* The tag name used by DSP audio */
     5.8 -#define DSP_DRIVER_NAME         "dsp"
     5.9 -
    5.10  static void
    5.11  DSP_Deinitialize(void)
    5.12  {
    5.13 @@ -318,7 +315,7 @@
    5.14  
    5.15  
    5.16  AudioBootStrap DSP_bootstrap = {
    5.17 -    DSP_DRIVER_NAME, "OSS /dev/dsp standard audio", DSP_Init, 0
    5.18 +    "dsp", "OSS /dev/dsp standard audio", DSP_Init, 0
    5.19  };
    5.20  
    5.21  /* vi: set ts=4 sw=4 expandtab: */

     6.1 --- a/src/audio/esd/SDL_esdaudio.c	Thu Aug 04 00:31:11 2011 -0400
     6.2 +++ b/src/audio/esd/SDL_esdaudio.c	Tue Jul 26 14:18:00 2011 -0700
     6.3 @@ -41,9 +41,6 @@
     6.4  #define SDL_NAME(X)	X
     6.5  #endif
     6.6  
     6.7 -/* The tag name used by ESD audio */
     6.8 -#define ESD_DRIVER_NAME		"esd"
     6.9 -
    6.10  #ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
    6.11  
    6.12  static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC;
    6.13 @@ -345,7 +342,7 @@
    6.14  
    6.15  
    6.16  AudioBootStrap ESD_bootstrap = {
    6.17 -    ESD_DRIVER_NAME, "Enlightened Sound Daemon", ESD_Init, 0
    6.18 +    "esd", "Enlightened Sound Daemon", ESD_Init, 0
    6.19  };
    6.20  
    6.21  /* vi: set ts=4 sw=4 expandtab: */

     7.1 --- a/src/audio/fusionsound/SDL_fsaudio.c	Thu Aug 04 00:31:11 2011 -0400
     7.2 +++ b/src/audio/fusionsound/SDL_fsaudio.c	Tue Jul 26 14:18:00 2011 -0700
     7.3 @@ -48,8 +48,6 @@
     7.4  typedef DFBResult DirectResult;
     7.5  #endif
     7.6  
     7.7 -/* The tag name used by fusionsoundc audio */
     7.8 -#define SDL_FS_DRIVER_NAME         "fusionsound"
     7.9  /* Buffers to use - more than 2 gives a lot of latency */
    7.10  #define FUSION_BUFFERS				(2)
    7.11  
    7.12 @@ -344,7 +342,7 @@
    7.13  
    7.14  
    7.15  AudioBootStrap FUSIONSOUND_bootstrap = {
    7.16 -    SDL_FS_DRIVER_NAME, "FusionSound", SDL_FS_Init, 0
    7.17 +    "fusionsound", "FusionSound", SDL_FS_Init, 0
    7.18  };
    7.19  
    7.20  /* vi: set ts=4 sw=4 expandtab: */

     8.1 --- a/src/audio/nas/SDL_nasaudio.c	Thu Aug 04 00:31:11 2011 -0400
     8.2 +++ b/src/audio/nas/SDL_nasaudio.c	Tue Jul 26 14:18:00 2011 -0700
     8.3 @@ -32,9 +32,6 @@
     8.4  #include "../SDL_audio_c.h"
     8.5  #include "SDL_nasaudio.h"
     8.6  
     8.7 -/* The tag name used by nas audio */
     8.8 -#define NAS_DRIVER_NAME         "nas"
     8.9 -
    8.10  static struct SDL_PrivateAudioData *this2 = NULL;
    8.11  
    8.12  
    8.13 @@ -397,7 +394,7 @@
    8.14  }
    8.15  
    8.16  AudioBootStrap NAS_bootstrap = {
    8.17 -    NAS_DRIVER_NAME, "Network Audio System", NAS_Init, 0
    8.18 +    "nas", "Network Audio System", NAS_Init, 0
    8.19  };
    8.20  
    8.21  /* vi: set ts=4 sw=4 expandtab: */

     9.1 --- a/src/audio/paudio/SDL_paudio.c	Thu Aug 04 00:31:11 2011 -0400
     9.2 +++ b/src/audio/paudio/SDL_paudio.c	Tue Jul 26 14:18:00 2011 -0700
     9.3 @@ -45,9 +45,6 @@
     9.4  #undef BIG_ENDIAN
     9.5  #include <sys/audio.h>
     9.6  
     9.7 -/* The tag name used by paud audio */
     9.8 -#define PAUDIO_DRIVER_NAME         "paud"
     9.9 -
    9.10  /* Open the audio device for playback, and don't block if busy */
    9.11  /* #define OPEN_FLAGS	(O_WRONLY|O_NONBLOCK) */
    9.12  #define OPEN_FLAGS	O_WRONLY
    9.13 @@ -545,7 +542,7 @@
    9.14  }
    9.15  
    9.16  AudioBootStrap PAUDIO_bootstrap = {
    9.17 -    PAUDIO_DRIVER_NAME, "AIX Paudio", PAUDIO_Init, 0
    9.18 +    "paud", "AIX Paudio", PAUDIO_Init, 0
    9.19  };
    9.20  
    9.21  /* vi: set ts=4 sw=4 expandtab: */

    10.1 --- a/src/audio/pulseaudio/SDL_pulseaudio.c	Thu Aug 04 00:31:11 2011 -0400
    10.2 +++ b/src/audio/pulseaudio/SDL_pulseaudio.c	Tue Jul 26 14:18:00 2011 -0700
    10.3 @@ -47,9 +47,6 @@
    10.4  #include "SDL_pulseaudio.h"
    10.5  #include "SDL_loadso.h"
    10.6  
    10.7 -/* The tag name used by pulse audio */
    10.8 -#define PULSEAUDIO_DRIVER_NAME         "pulseaudio"
    10.9 -
   10.10  #if (PA_API_VERSION < 12)
   10.11  /** Return non-zero if the passed state is one of the connected states */
   10.12  static inline int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
   10.13 @@ -502,7 +499,7 @@
   10.14  
   10.15  
   10.16  AudioBootStrap PULSEAUDIO_bootstrap = {
   10.17 -    PULSEAUDIO_DRIVER_NAME, "PulseAudio", PULSEAUDIO_Init, 0
   10.18 +    "pulseaudio", "PulseAudio", PULSEAUDIO_Init, 0
   10.19  };
   10.20  
   10.21  #endif /* SDL_AUDIO_DRIVER_PULSEAUDIO */

    11.1 --- a/src/audio/qsa/SDL_qsa_audio.c	Thu Aug 04 00:31:11 2011 -0400
    11.2 +++ b/src/audio/qsa/SDL_qsa_audio.c	Tue Jul 26 14:18:00 2011 -0700
    11.3 @@ -38,9 +38,6 @@
    11.4  #include "../SDL_audio_c.h"
    11.5  #include "SDL_qsa_audio.h"
    11.6  
    11.7 -/* The tag name used by QSA audio framework */
    11.8 -#define DRIVER_NAME "qsa"
    11.9 -
   11.10  /* default channel communication parameters */
   11.11  #define DEFAULT_CPARAMS_RATE   44100
   11.12  #define DEFAULT_CPARAMS_VOICES 1
   11.13 @@ -863,7 +860,7 @@
   11.14  }
   11.15  
   11.16  AudioBootStrap QSAAUDIO_bootstrap = {
   11.17 -    DRIVER_NAME, "QNX QSA Audio", QSA_Init, 0
   11.18 +    "qsa", "QNX QSA Audio", QSA_Init, 0
   11.19  };
   11.20  
   11.21  /* vi: set ts=4 sw=4 expandtab: */

    12.1 --- a/src/audio/ums/SDL_umsaudio.c	Thu Aug 04 00:31:11 2011 -0400
    12.2 +++ b/src/audio/ums/SDL_umsaudio.c	Tue Jul 26 14:18:00 2011 -0700
    12.3 @@ -40,9 +40,6 @@
    12.4  #include "../SDL_audio_c.h"
    12.5  #include "SDL_umsaudio.h"
    12.6  
    12.7 -/* The tag name used by UMS audio */
    12.8 -#define UMS_DRIVER_NAME         "ums"
    12.9 -
   12.10  #define DEBUG_AUDIO 1
   12.11  
   12.12  /* Audio driver functions */
   12.13 @@ -152,8 +149,7 @@
   12.14  }
   12.15  
   12.16  AudioBootStrap UMS_bootstrap = {
   12.17 -    UMS_DRIVER_NAME, "AIX UMS audio",
   12.18 -    Audio_Available, Audio_CreateDevice, 0
   12.19 +    "ums", "AIX UMS audio", Audio_Available, Audio_CreateDevice, 0
   12.20  };
   12.21  
   12.22  static Uint8 *