From 07990fcdad3e635f05d53ab35d89ebece45f7eb2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Thu, 20 May 2010 21:11:08 +0200 Subject: [PATCH] Fix assertions. (dts-dynrng and spdif are boolean parameters) This close #3646 --- modules/audio_filter/converter/dtstofloat32.c | 2 +- modules/audio_output/alsa.c | 2 +- modules/audio_output/auhal.c | 2 +- modules/audio_output/directx.c | 2 +- modules/audio_output/oss.c | 4 ++-- modules/audio_output/waveout.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index 6d1ffa04b0..98c5fa0259 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -96,7 +96,7 @@ vlc_module_end () static int Open( vlc_object_t *p_this, filter_sys_t *p_sys, audio_format_t input, audio_format_t output ) { - p_sys->b_dynrng = var_InheritInteger( p_this, "dts-dynrng" ); + p_sys->b_dynrng = var_InheritBool( p_this, "dts-dynrng" ); p_sys->b_dontwarn = 0; /* We'll do our own downmixing, thanks. */ diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index cd9f5edd47..ffb1c80e77 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -253,7 +253,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( var_InheritInteger( p_aout, "spdif" ) ) + if( var_InheritBool( p_aout, "spdif" ) ) var_Set( p_aout, "audio-device", val ); snd_pcm_close( p_sys->p_snd_pcm ); diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 15f25878de..d3f22a7242 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -1041,7 +1041,7 @@ static void Probe( aout_instance_t * p_aout ) var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); free( text.psz_string ); if( p_sys->i_default_dev == p_devices[i] - && var_InheritInteger( p_aout, "spdif" ) ) + && var_InheritBool( p_aout, "spdif" ) ) { /* We selected to prefer SPDIF output if available * then this "dummy" entry should be selected */ diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index f7e6895d31..f03db57ce9 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -553,7 +553,7 @@ 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 ); } } diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index d5ffb6dd28..d3e4a74e12 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" ); } diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index c7a7e66113..514f04dfe8 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -462,7 +462,7 @@ static void Probe( aout_instance_t * p_aout ) text.psz_string = (char *)_("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 ); } } -- 2.39.2