[vlc-commits] commit: Fix assertions. (dts-dynrng and spdif are boolean parameters) ( Rémi Duraffort )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu May 20 21:11:08 2010 +0200| [9e64fd60dbf6bcbcbb3872acd15e6f265d3d6b89] | committer: Rémi Duraffort 

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

This close #3646
(cherry picked from commit 07990fcdad3e635f05d53ab35d89ebece45f7eb2)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=9e64fd60dbf6bcbcbb3872acd15e6f265d3d6b89
---

 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 6d1ffa0..98c5fa0 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 cd9f5ed..ffb1c80 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 15f2587..d3f22a7 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 f7e6895..f03db57 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 d5ffb6d..d3e4a74 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 c7a7e66..514f04d 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 );
         }
     }