summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@users.sourceforge.net>2004-07-14 23:29:09 +0000
committerBastien Nocera <hadess@users.sourceforge.net>2004-07-14 23:29:09 +0000
commit9cfadb0fe3a0a6965cbe7e2350bf106b500080d7 (patch)
tree64303c5036133f52dafbd63f7e0ca5ecb4df9977
parentc96f17102d2223f6d2c3efdcb9bd2aef7a9b3bb8 (diff)
downloadxine-lib-9cfadb0fe3a0a6965cbe7e2350bf106b500080d7.tar.gz
xine-lib-9cfadb0fe3a0a6965cbe7e2350bf106b500080d7.tar.bz2
- change the default output device for stereo and surrounds to be "default"
rather than "0", so that the default sound output can be overriden easily using /etc/asound.conf CVS patchset: 6795 CVS date: 2004/07/14 23:29:09
-rw-r--r--src/audio_out/audio_alsa_out.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 560b9375d..648873001 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
* (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
*
*
- * $Id: audio_alsa_out.c,v 1.144 2004/06/20 15:04:19 mroi Exp $
+ * $Id: audio_alsa_out.c,v 1.145 2004/07/14 23:29:09 hadess Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1355,7 +1355,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
NULL);
pcm_device = config->register_string(config,
"audio.alsa_front_device",
- "plug:front:0",
+ "plug:front:default",
_("device used for stereo output"),
_("xine will use this alsa device to output "
"stereo sound.\nSee the alsa documentation "
@@ -1364,7 +1364,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
NULL);
pcm_device = config->register_string(config,
"audio.alsa_surround40_device",
- "plug:surround40:0",
+ "plug:surround40:default",
_("device used for 4-channel output"),
_("xine will use this alsa device to output "
"4 channel (4.0) surround sound.\nSee the "
@@ -1374,7 +1374,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
NULL);
pcm_device = config->register_string(config,
"audio.alsa_surround51_device",
- "plug:surround51:0",
+ "plug:surround51:default",
_("device used for 5.1-channel output"),
_("xine will use this alsa device to output "
"5 channel plus LFE (5.1) surround sound.\n"