From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 30 Dec 2009 18:29:25 +0000 (+0200)
Subject: ALSA output: kill config_Get
X-Git-Tag: 1.1.0-ff~1571
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bc76f50aa6f0f19e05470b7a3935fd629a969152;p=vlc

ALSA output: kill config_Get
---

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 36b8c9a990..ccf0537632 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -251,7 +251,7 @@ static void Probe( aout_instance_t * p_aout,
             text.psz_string = (char*)N_("A/52 over S/PDIF");
             var_Change( p_aout, "audio-device",
                         VLC_VAR_ADDCHOICE, &val, &text );
-            if( config_GetInt( p_aout, "spdif" ) )
+            if( var_InheritInteger( p_aout, "spdif" ) )
                 var_Set( p_aout, "audio-device", val );
 
             snd_pcm_close( p_sys->p_snd_pcm );
@@ -330,7 +330,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_ENOMEM;
 
     /* Get device name */
-    if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
+    if( (psz_device = var_InheritString( p_aout, "alsa-audio-device" )) == NULL )
     {
         msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
         dialog_Fatal( p_aout, _("No Audio Device"), "%s",