Commit 07990fcd authored by Rémi Duraffort's avatar Rémi Duraffort

Fix assertions. (dts-dynrng and spdif are boolean parameters)

This close #3646
parent cc4995b9
......@@ -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. */
......
......@@ -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 );
......
......@@ -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 */
......
......@@ -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 );
}
}
......
......@@ -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" );
}
......
......@@ -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 );
}
}
......
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