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

This close #3646

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 6d1ffa04b0b52a85f61cae54ad3e940ba7016934..98c5fa02597bbd602174e097169389b492fbc518 100644 (file)
--- 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 cd9f5edd47dfcc19c9ad5b865f6ea8256f1dacd7..ffb1c80e77b9321a2b0a733eed68320cfa41e388 100644 (file)
--- 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 15f25878de0db9e9d2c11d0b1acf7b8021aebfb3..d3f22a72428d3eaf402dc6071e145e6c76ee6d96 100644 (file)
--- 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 f7e6895d313cfdf6c16aff0468f6a9196bfdf178..f03db57ce9c08d647db2f5259e7198c9d9951947 100644 (file)
--- 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 d5ffb6dd28bac397490850a1549688d24e47b782..d3e4a74e12ad34531376f1a1669eb83039d6987f 100644 (file)
--- 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 c7a7e66113c5161760f24f68c952bbb82fba6854..514f04dfe8f6fbb8d8347a868e822dfcd6df6813 100644 (file)
--- 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 );
         }
     }