diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-03 13:40:12 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-03 13:40:12 +0000 |
| commit | c1dbdbc84331a40c349de9197e445f5f6ee56f78 (patch) | |
| tree | d69b75041fbb0b06e0368d4aa7fd027a363f24b0 | |
| parent | 7e2a1c7cccd3aa9e5ce97fb499fa970441be4da3 (diff) | |
| download | xine-lib-c1dbdbc84331a40c349de9197e445f5f6ee56f78.tar.gz xine-lib-c1dbdbc84331a40c349de9197e445f5f6ee56f78.tar.bz2 | |
close http://sourceforge.net/tracker/index.php?func=detail&aid=916089&group_id=9655&atid=109655
try to fix http://sourceforge.net/tracker/index.php?func=detail&aid=925723&group_id=9655&atid=109655
CVS patchset: 6634
CVS date: 2004/06/03 13:40:12
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index bea7b8d27..6abc44cb5 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.142 2004/05/23 16:20:57 mroi Exp $ + * $Id: audio_alsa_out.c,v 1.143 2004/06/03 13:40:12 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -1274,7 +1274,7 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) { "of the mixer settings on the fly."), 10, NULL, NULL); - if (send_events == 1) + if (send_events == 1 && found) { pthread_attr_t pth_attrs; struct sched_param pth_params; @@ -1356,7 +1356,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", - "front", + "plug:front:0", _("device used for stereo output"), _("xine will use this alsa device to output " "stereo sound.\nSee the alsa documentation " @@ -1365,7 +1365,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", - "surround40", + "plug:surround40:0", _("device used for 4-channel output"), _("xine will use this alsa device to output " "4 channel (4.0) surround sound.\nSee the " @@ -1375,7 +1375,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", - "surround51", + "plug:surround51:0", _("device used for 5.1-channel output"), _("xine will use this alsa device to output " "5 channel plus LFE (5.1) surround sound.\n" |