Skip to content

V
vlc-2-2
Commit bc76f50a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

ALSA output: kill config_Get

parent 4af1e5a2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/audio_output/alsa.c
View file @ bc76f50a
...@@ -251,7 +251,7 @@ static void Probe( aout_instance_t * p_aout, ...@@ -251,7 +251,7 @@ static void Probe( aout_instance_t * p_aout,
text.psz_string = (char*)N_("A/52 over S/PDIF"); text.psz_string = (char*)N_("A/52 over S/PDIF");
var_Change( p_aout, "audio-device", var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text ); VLC_VAR_ADDCHOICE, &val, &text );
if( config_GetInt( p_aout, "spdif" ) ) if( var_InheritInteger( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val ); var_Set( p_aout, "audio-device", val );
snd_pcm_close( p_sys->p_snd_pcm ); snd_pcm_close( p_sys->p_snd_pcm );
...@@ -330,7 +330,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -330,7 +330,7 @@ static int Open( vlc_object_t *p_this )
return VLC_ENOMEM; return VLC_ENOMEM;
/* Get device name */ /* 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\" ?)" ); msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
dialog_Fatal( p_aout, _("No Audio Device"), "%s", dialog_Fatal( p_aout, _("No Audio Device"), "%s",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment