[vlc-commits] ALSA: do not insist if the device string is empty, just fail

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Apr  8 00:18:39 2011 +0300| [7be4fec89ddfe7338a74c443d7cd8bf36050544f] | committer: Rémi Denis-Courmont

ALSA: do not insist if the device string is empty, just fail

Either we are out of memory, or someone really did not want ALSA.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7be4fec89ddfe7338a74c443d7cd8bf36050544f
---

 modules/audio_output/alsa.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 2ee01ed..f1c382a 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -328,12 +328,8 @@ static int Open( vlc_object_t *p_this )
     char *psz_device = var_InheritString( p_aout, "alsa-audio-device" );
     if( unlikely(psz_device == NULL) )
     {
-        psz_device = strdup( DEFAULT_ALSA_DEVICE );
-        if( unlikely(psz_device == NULL) )
-        {
-            free( p_sys );
-            return VLC_ENOMEM;
-        }
+        free( p_sys );
+        return VLC_EGENERIC;
     }
 
     /* Choose the IEC device for S/PDIF output: