Skip to content

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

DirectX audio output: kill config_Get

parent 5f794a2b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/audio_output/directx.c
View file @ 05320812
...@@ -553,7 +553,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -553,7 +553,7 @@ static void Probe( aout_instance_t * p_aout )
text.psz_string = _("A/52 over S/PDIF"); text.psz_string = _("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 );
} }
} }
...@@ -702,7 +702,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) ...@@ -702,7 +702,7 @@ static int InitDirectSound( aout_instance_t *p_aout )
"DirectSoundEnumerateW" ); "DirectSoundEnumerateW" );
if( OurDirectSoundEnumerate ) if( OurDirectSoundEnumerate )
{ {
p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name"); p_aout->output.p_sys->psz_device = var_InheritString(p_aout, "directx-audio-device-name");
/* Attempt enumeration */ /* Attempt enumeration */
if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum, if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum,
p_aout ) ) ) p_aout ) ) )
......
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