From 00512219b700c8f0a6bfc3598804c72b0c984f0c Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Wed, 14 Apr 2004 21:30:32 +0000 Subject: don't give up at first mixer init failure.patch from Ronald Wahl CVS patchset: 6403 CVS date: 2004/04/14 21:30:32 --- src/audio_out/audio_alsa_out.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 825c8b267..72cf44674 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 * * - * $Id: audio_alsa_out.c,v 1.136 2004/04/11 15:27:19 mroi Exp $ + * $Id: audio_alsa_out.c,v 1.137 2004/04/14 21:30:32 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -1171,16 +1171,16 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) { &this->mixer.left_vol)) < 0) { xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "audio_alsa_out: snd_mixer_selem_get_playback_volume(): %s\n", snd_strerror(err)); - snd_mixer_close(this->mixer.handle); - return; + this->mixer.elem = NULL; + continue; } if((err = snd_mixer_selem_get_playback_volume(this->mixer.elem, SND_MIXER_SCHN_FRONT_RIGHT, &this->mixer.right_vol)) < 0) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "audio_alsa_out: snd_mixer_selem_get_playback_volume(): %s\n", snd_strerror(err)); - snd_mixer_close(this->mixer.handle); - return; + this->mixer.elem = NULL; + continue; } /* Channels mute */ -- cgit v1.2.3