X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=a05fcf16b6768bf79aad50a3eaf3494ec09685bd;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=d5ffb6dd28bac397490850a1549688d24e47b782;hpb=7e45ab1b284217f191c35c5c2916742b4fbe39ee;p=vlc diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index d5ffb6dd28..a05fcf16b6 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -246,10 +246,10 @@ static void Probe( aout_instance_t * p_aout ) text.psz_string = _("A/52 over S/PDIF"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); - if( var_InheritInteger( p_aout, "spdif" ) ) + if( var_InheritBool( p_aout, "spdif" ) ) var_Set( p_aout, "audio-device", val ); } - else if( var_InheritInteger( p_aout, "spdif" ) ) + else if( var_InheritBool( p_aout, "spdif" ) ) { msg_Warn( p_aout, "S/PDIF not supported by card" ); } @@ -353,7 +353,8 @@ static int Open( vlc_object_t *p_this ) else { /* This should not happen ! */ - msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int ); + msg_Err( p_aout, "internal: can't find audio-device (%"PRId64")", + val.i_int ); close( p_sys->i_fd ); free( p_sys ); return VLC_EGENERIC; @@ -509,7 +510,7 @@ static int Open( vlc_object_t *p_this ) } p_aout->output.p_sys->b_workaround_buggy_driver = - var_InheritInteger( p_aout, "oss-buggy" ); + var_InheritBool( p_aout, "oss-buggy" ); /* Create OSS thread and wait for its readiness. */ if( vlc_thread_create( p_aout, "aout", OSSThread,