X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fintf.c;h=ae41f05e9b714c895ad2a63121679db2a47b69cb;hb=4e9597b800d1140dfab1cf33c3df8c608d58878f;hp=b341570f2d08b1f0de26d1d4122c85c59bf456cf;hpb=e10343bb5d2a5d989ea7616233551882b319eb6b;p=vlc diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index b341570f2d..ae41f05e9b 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -25,7 +25,11 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include /* calloc(), malloc(), free() */ @@ -100,7 +104,7 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume ) config_PutInt( p_object, "volume", i_volume ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_object->p_libvlc, "volume-change", val ); if ( p_aout == NULL ) return 0; @@ -153,6 +157,7 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft ) int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, audio_volume_t * pi_volume ) { + vlc_value_t val; aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); int i_result = 0, i_volume = 0, i_volume_step = 0; @@ -170,7 +175,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, (audio_volume_t) i_volume ); if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_object->p_libvlc, "volume-change", val ); if ( p_aout == NULL ) return 0; @@ -196,6 +201,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, audio_volume_t * pi_volume ) { + vlc_value_t val; aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); int i_result = 0, i_volume = 0, i_volume_step = 0; @@ -212,7 +218,7 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume ); if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_object->p_libvlc, "volume-change", val ); if ( p_aout == NULL ) return 0; @@ -361,7 +367,7 @@ int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume ) static int aout_Restart( aout_instance_t * p_aout ) { int i; - vlc_bool_t b_error = 0; + bool b_error = 0; vlc_mutex_lock( &p_aout->mixer_lock ); @@ -481,66 +487,19 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable, * \param b_add are we adding or removing the filter ? */ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name, - vlc_bool_t b_add ) + bool b_add ) { - char *psz_parser, *psz_string; - aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + aout_instance_t *p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); - if( p_aout ) - psz_string = var_GetNonEmptyString( p_aout, "audio-filter" ); - else - psz_string = config_GetPsz( p_this, "audio-filter" ); - - if( !psz_string ) psz_string = strdup(""); - - psz_parser = strstr( psz_string, psz_name ); - - if( b_add ) - { - if( !psz_parser ) - { - psz_parser = psz_string; - asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s", - psz_string, psz_name ); - free( psz_parser ); - } - else - { - vlc_object_release( p_aout ); - return; - } - } - else + if( AoutChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) ) { - if( psz_parser ) - { - memmove( psz_parser, psz_parser + strlen(psz_name) + - (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ), - strlen(psz_parser + strlen(psz_name)) + 1 ); - - if( *(psz_string+strlen(psz_string ) -1 ) == ':' ) - { - *(psz_string+strlen(psz_string ) -1 ) = '\0'; - } - } - else - { - free( psz_string ); - return; - } + if( p_aout ) + AoutInputsMarkToRestart( p_aout ); } - if( p_aout == NULL ) - config_PutPsz( p_this, "audio-filter", psz_string ); - else - { - var_SetString( p_aout, "audio-filter", psz_string ); - for( int i = 0; i < p_aout->i_nb_inputs; i++ ) - p_aout->pp_inputs[i]->b_restart = VLC_TRUE; + if( p_aout ) vlc_object_release( p_aout ); - } - free( psz_string ); } /**