Commit 797d3efe authored by Rémi Duraffort's avatar Rémi Duraffort

aout: use var_GetString(bool) when applicable.

parent 691b879e
...@@ -219,39 +219,39 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t ...@@ -219,39 +219,39 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t
const char* psz_variable, const char* psz_variable,
const char *psz_name, bool b_add ) const char *psz_name, bool b_add )
{ {
vlc_value_t val; char *psz_val;
char *psz_parser; char *psz_parser;
if( *psz_name == '\0' ) if( *psz_name == '\0' )
return false; return false;
if( p_aout ) if( p_aout )
var_Get( p_aout, psz_variable, &val ); psz_val = var_GetString( p_aout, psz_variable );
else else
val.psz_string = config_GetPsz( p_obj, "audio-filter" ); psz_val = config_GetPsz( p_obj, "audio-filter" );
if( !val.psz_string ) if( !psz_val )
val.psz_string = strdup(""); 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 ) ) if( ( b_add && psz_parser ) || ( !b_add && !psz_parser ) )
{ {
/* Nothing to do */ /* Nothing to do */
free( val.psz_string ); free( psz_val );
return false; return false;
} }
if( b_add ) if( b_add )
{ {
char *psz_old = val.psz_string; char *psz_old = psz_val;
if( *psz_old ) if( *psz_old )
{ {
if( asprintf( &val.psz_string, "%s:%s", psz_old, psz_name ) == -1 ) if( asprintf( &psz_val, "%s:%s", psz_old, psz_name ) == -1 )
val.psz_string = NULL; psz_val = NULL;
} }
else else
val.psz_string = strdup( psz_name ); psz_val = strdup( psz_name );
free( psz_old ); free( psz_old );
} }
else else
...@@ -267,10 +267,10 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t ...@@ -267,10 +267,10 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t
} }
if( p_aout ) if( p_aout )
var_Set( p_aout, psz_variable, val ); var_SetString( p_aout, psz_variable, psz_val );
else else
config_PutPsz( p_obj, psz_variable, val.psz_string ); config_PutPsz( p_obj, psz_variable, psz_val );
free( val.psz_string ); free( psz_val );
return true; return true;
} }
......
...@@ -77,7 +77,6 @@ static void aout_Destructor( vlc_object_t * p_this ); ...@@ -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 * __aout_New( vlc_object_t * p_parent )
{ {
aout_instance_t * p_aout; aout_instance_t * p_aout;
vlc_value_t val;
/* Allocate descriptor. */ /* Allocate descriptor. */
p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT ); p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
...@@ -97,8 +96,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) ...@@ -97,8 +96,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
p_aout->output.b_starving = 1; p_aout->output.b_starving = 1;
var_Create( p_aout, "intf-change", VLC_VAR_BOOL ); var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
val.b_bool = true; var_SetBool( p_aout, "intf-change", true );
var_Set( p_aout, "intf-change", val );
vlc_object_set_destructor( p_aout, aout_Destructor ); vlc_object_set_destructor( p_aout, aout_Destructor );
......
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