From e0499d3813fc84e6f77f6bad8b9cd525dfb79180 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 18 Jul 2010 18:59:59 +0300 Subject: [PATCH] ALSA: use default device if none specified instead of failing --- modules/audio_output/alsa.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 146e11d802..af87d42f7a 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -345,14 +345,15 @@ static int Open( vlc_object_t *p_this ) return VLC_ENOMEM; /* Get device name */ - if( (psz_device = var_InheritString( p_aout, "alsa-audio-device" )) == NULL ) + psz_device = var_InheritString( p_aout, "alsa-audio-device" ); + if( unlikely(psz_device == NULL) ) { - msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" ); - dialog_Fatal( p_aout, _("No Audio Device"), "%s", - _("No audio device name was given. You might want to " \ - "enter \"default\".") ); - free( p_sys ); - return VLC_EGENERIC; + psz_device = strdup( DEFAULT_ALSA_DEVICE ); + if( unlikely(psz_device == NULL) ) + { + free( p_sys ); + return VLC_ENOMEM; + } } /* Choose the IEC device for S/PDIF output: -- 2.11.4.GIT