]> git.sesse.net Git - vlc/commitdiff
ALSA output: kill config_Get
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 18:29:25 +0000 (20:29 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 18:39:37 +0000 (20:39 +0200)
modules/audio_output/alsa.c

index 36b8c9a9904ce5f7e1598f76cffc57f98ef12134..ccf053763217a8f8e1da6b2d727d56fe47d90916 100644 (file)
@@ -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",