From 797d3efebf0c1f0b9a4c5f0735f4a0ed900c6f53 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Duraffort?= <ivoire@videolan.org>
Date: Thu, 17 Sep 2009 19:06:39 +0200
Subject: [PATCH] aout: use var_GetString(bool) when applicable.

---
 src/audio_output/aout_internal.h | 28 ++++++++++++++--------------
 src/audio_output/common.c        |  4 +---
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index f900b1a09e..80a96401ce 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -219,39 +219,39 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t
                                            const char* psz_variable,
                                            const char *psz_name, bool b_add )
 {
-    vlc_value_t val;
+    char *psz_val;
     char *psz_parser;
 
     if( *psz_name == '\0' )
         return false;
 
     if( p_aout )
-        var_Get( p_aout, psz_variable, &val );
+        psz_val = var_GetString( p_aout, psz_variable );
     else
-        val.psz_string = config_GetPsz( p_obj, "audio-filter" );
+        psz_val = config_GetPsz( p_obj, "audio-filter" );
 
-    if( !val.psz_string )
-        val.psz_string = strdup("");
+    if( !psz_val )
+        psz_val = strdup( "" );
 
-    psz_parser = strstr( val.psz_string, psz_name );
+    psz_parser = strstr( psz_val, psz_name );
 
     if( ( b_add && psz_parser ) || ( !b_add && !psz_parser ) )
     {
         /* Nothing to do */
-        free( val.psz_string );
+        free( psz_val );
         return false;
     }
 
     if( b_add )
     {
-        char *psz_old = val.psz_string;
+        char *psz_old = psz_val;
         if( *psz_old )
         {
-            if( asprintf( &val.psz_string, "%s:%s", psz_old, psz_name ) == -1 )
-                val.psz_string = NULL;
+            if( asprintf( &psz_val, "%s:%s", psz_old, psz_name ) == -1 )
+                psz_val = NULL;
         }
         else
-            val.psz_string = strdup( psz_name );
+            psz_val = strdup( psz_name );
         free( psz_old );
     }
     else
@@ -267,10 +267,10 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t
     }
 
     if( p_aout )
-        var_Set( p_aout, psz_variable, val );
+        var_SetString( p_aout, psz_variable, psz_val );
     else
-        config_PutPsz( p_obj, psz_variable, val.psz_string );
-    free( val.psz_string );
+        config_PutPsz( p_obj, psz_variable, psz_val );
+    free( psz_val );
     return true;
 }
 
diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 43ed69c550..c6a0d686f3 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -77,7 +77,6 @@ static void aout_Destructor( vlc_object_t * p_this );
 aout_instance_t * __aout_New( vlc_object_t * p_parent )
 {
     aout_instance_t * p_aout;
-    vlc_value_t val;
 
     /* Allocate descriptor. */
     p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
@@ -97,8 +96,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     p_aout->output.b_starving = 1;
 
     var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
-    val.b_bool = true;
-    var_Set( p_aout, "intf-change", val );
+    var_SetBool( p_aout, "intf-change", true );
 
     vlc_object_set_destructor( p_aout, aout_Destructor );
 
-- 
2.39.2