# HG changeset patch # User Sam Lantinga # Date 1255427960 0 # Node ID afadcd7d23195ba707dd509b93679627c9c1aebe # Parent 55717a755897f1dfc84eadcd1b8b5a0687a4befd Use the plug: ALSA devices for surround sound formats, which have automatic sample format/rate conversion. Based on feedback from the ALSA development mailing list: http://mailman.alsa-project.org/pipermail/alsa-devel/2009-October/022267.html diff -r 55717a755897 -r afadcd7d2319 src/audio/alsa/SDL_alsa_audio.c --- a/src/audio/alsa/SDL_alsa_audio.c Tue Oct 13 09:56:15 2009 +0000 +++ b/src/audio/alsa/SDL_alsa_audio.c Tue Oct 13 09:59:20 2009 +0000 @@ -43,9 +43,6 @@ /* The tag name used by ALSA audio */ #define DRIVER_NAME "alsa" -/* The default ALSA audio driver */ -#define DEFAULT_DEVICE "default" - /* Whether we should set the buffer size or the period size */ /*#define SET_PERIOD_SIZE*/ /*#define DEBUG_PERIOD_SIZE*/ @@ -172,9 +169,17 @@ device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ if ( device == NULL ) { - if (channels == 6) device = "surround51"; - else if (channels == 4) device = "surround40"; - else device = DEFAULT_DEVICE; + switch (channels) { + case 6: + device = "plug:surround51"; + break; + case 4: + device = "plug:surround40"; + break; + default: + device = "default"; + break; + } } return device; }