[vlc-devel] commit: ALSA output: kill config_Get ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Dec 30 19:39:44 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 30 20:29:25 2009 +0200| [bc76f50aa6f0f19e05470b7a3935fd629a969152] | committer: Rémi Denis-Courmont 

ALSA output: kill config_Get

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

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

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 36b8c9a..ccf0537 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",




More information about the vlc-devel mailing list