X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fintf.c;h=e373298c38b8eca9be24f02bf15da8a238c50d68;hb=d9f6b0dec075b94e982b0dc1cbe73d432be23a7a;hp=1a36db4ee313247b63311aa9fe3bfb54b1caf717;hpb=c3a1a3712f639eff527d030d129734934aa8b919;p=vlc diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index 1a36db4ee3..e373298c38 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -1,7 +1,7 @@ /***************************************************************************** * intf.c : audio output API towards the interface modules ***************************************************************************** - * Copyright (C) 2002-2004 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -24,15 +24,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include #include /* calloc(), malloc(), free() */ #include -#include - -#include "audio_output.h" +#include #include "aout_internal.h" - /* * Volume management * @@ -73,7 +78,7 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume ) return 0; } - vlc_mutex_lock( &p_aout->mixer_lock ); + aout_lock_mixer( p_aout ); if ( !p_aout->mixer.b_error ) { i_result = p_aout->output.pf_volume_get( p_aout, pi_volume ); @@ -82,7 +87,7 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume ) { *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); vlc_object_release( p_aout ); return i_result; @@ -93,25 +98,26 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume ) *****************************************************************************/ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume ) { - vlc_value_t val; - aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - int i_result = 0; - config_PutInt( p_object, "volume", i_volume ); + var_SetBool( p_object->p_libvlc, "volume-change", true ); - val.b_bool = VLC_TRUE; - var_Set( p_object->p_vlc, "volume-change", val ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume ); - if ( p_aout == NULL ) return 0; + aout_instance_t *p_aout = vlc_object_find( p_object, + VLC_OBJECT_AOUT, FIND_ANYWHERE ); + if ( p_aout == NULL ) + return VLC_SUCCESS; + + int i_result = VLC_SUCCESS; + aout_lock_mixer( p_aout ); - vlc_mutex_lock( &p_aout->mixer_lock ); if ( !p_aout->mixer.b_error ) - { i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); - } - vlc_mutex_unlock( &p_aout->mixer_lock ); - var_Set( p_aout, "intf-change", val ); + aout_unlock_mixer( p_aout ); + + var_SetBool( p_aout, "intf-change", true ); vlc_object_release( p_aout ); return i_result; } @@ -127,7 +133,7 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft ) if ( p_aout == NULL ) return 0; - vlc_mutex_lock( &p_aout->mixer_lock ); + aout_lock_mixer( p_aout ); if ( p_aout->mixer.b_error ) { /* The output module is destroyed. */ @@ -137,7 +143,7 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft ) { i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); vlc_object_release( p_aout ); return i_result; @@ -152,32 +158,36 @@ 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 ) { - 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; - i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" ); - i_volume = config_GetInt( p_object, "volume" ); - i_volume += i_volume_step * i_nb_steps; + const int i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" ); + + int i_volume = config_GetInt( p_object, "volume" ) + + i_volume_step * i_nb_steps; if ( i_volume > AOUT_VOLUME_MAX ) - { i_volume = AOUT_VOLUME_MAX; - } + else if ( i_volume < AOUT_VOLUME_MIN ) + i_volume = AOUT_VOLUME_MIN; + config_PutInt( p_object, "volume", i_volume ); var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); - var_SetInteger( p_object->p_libvlc, "saved-volume" , - (audio_volume_t) i_volume ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; + var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume ); + if ( pi_volume != NULL ) + *pi_volume = i_volume; - if ( p_aout == NULL ) return 0; + var_SetBool( p_object->p_libvlc, "volume-change", true ); + + aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + if ( p_aout == NULL ) + return 0; - vlc_mutex_lock( &p_aout->mixer_lock ); + int i_result; + aout_lock_mixer( p_aout ); if ( !p_aout->mixer.b_error ) - { - i_result = p_aout->output.pf_volume_set( p_aout, - (audio_volume_t) i_volume ); - } - vlc_mutex_unlock( &p_aout->mixer_lock ); + i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); + else + i_result = VLC_SUCCESS; + aout_unlock_mixer( p_aout ); vlc_object_release( p_aout ); return i_result; @@ -192,42 +202,16 @@ 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 ) { - 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; - - i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" ); - i_volume = config_GetInt( p_object, "volume" ); - i_volume -= i_volume_step * i_nb_steps; - if ( i_volume < AOUT_VOLUME_MIN ) - { - i_volume = AOUT_VOLUME_MIN; - } - config_PutInt( p_object, "volume", i_volume ); - var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); - var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; - - if ( p_aout == NULL ) return 0; - - vlc_mutex_lock( &p_aout->mixer_lock ); - if ( !p_aout->mixer.b_error ) - { - i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t) i_volume ); - } - vlc_mutex_unlock( &p_aout->mixer_lock ); - - vlc_object_release( p_aout ); - return i_result; + return __aout_VolumeUp( p_object, -i_nb_steps, pi_volume ); } /***************************************************************************** - * aout_VolumeMute : Mute/un-mute the output volume + * aout_ToggleMute : Mute/un-mute the output volume ***************************************************************************** * If pi_volume != NULL, *pi_volume will contain the volume at the end of the * function (muted => 0). *****************************************************************************/ -int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume ) +int __aout_ToggleMute( vlc_object_t * p_object, audio_volume_t * pi_volume ) { int i_result; audio_volume_t i_volume; @@ -284,6 +268,7 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout ) /* Placeholder for pf_volume_infos(). */ int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) { + (void)p_aout; *pi_soft = 0; return 0; } @@ -320,18 +305,21 @@ void aout_VolumeNoneInit( aout_instance_t * p_aout ) /* Placeholder for pf_volume_infos(). */ int aout_VolumeNoneInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) { + (void)p_aout; (void)pi_soft; return -1; } /* Placeholder for pf_volume_get(). */ int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume ) { + (void)p_aout; (void)pi_volume; return -1; } /* Placeholder for pf_volume_set(). */ int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume ) { + (void)p_aout; (void)i_volume; return -1; } @@ -347,24 +335,26 @@ int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume ) * This function is used whenever the parameters of the output plug-in are * changed (eg. selecting S/PDIF or PCM). *****************************************************************************/ -int aout_Restart( aout_instance_t * p_aout ) +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 ); + aout_lock_mixer( p_aout ); if ( p_aout->i_nb_inputs == 0 ) { - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); msg_Err( p_aout, "no decoder thread" ); return -1; } /* Lock all inputs. */ + aout_lock_input_fifos( p_aout ); + for ( i = 0; i < p_aout->i_nb_inputs; i++ ) { - vlc_mutex_lock( &p_aout->pp_inputs[i]->lock ); + aout_lock_input( p_aout, p_aout->pp_inputs[i] ); aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); } @@ -380,7 +370,8 @@ int aout_Restart( aout_instance_t * p_aout ) { vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_input_fifos( p_aout ); + aout_unlock_mixer( p_aout ); return -1; } @@ -391,7 +382,8 @@ int aout_Restart( aout_instance_t * p_aout ) { vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_input_fifos( p_aout ); + aout_unlock_mixer( p_aout ); return -1; } @@ -399,13 +391,13 @@ int aout_Restart( aout_instance_t * p_aout ) for ( i = 0; i < p_aout->i_nb_inputs; i++ ) { aout_input_t * p_input = p_aout->pp_inputs[i]; - - b_error |= aout_InputNew( p_aout, p_input ); + b_error |= aout_InputNew( p_aout, p_input, &p_input->request_vout ); p_input->b_changed = 1; - vlc_mutex_unlock( &p_input->lock ); + aout_unlock_input( p_aout, p_input ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_input_fifos( p_aout ); + aout_unlock_mixer( p_aout ); return b_error; } @@ -418,21 +410,16 @@ int aout_Restart( aout_instance_t * p_aout ) * rebuilding the audio-device and audio-channels variables. *****************************************************************************/ int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name, - vlc_value_t oldval, vlc_value_t val, void *p_data ) + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + (void)psz_name; (void)oldval; (void)newval; (void)p_data; if ( p_aout == NULL ) return VLC_SUCCESS; - if ( var_Type( p_aout, "audio-device" ) != 0 ) - { - var_Destroy( p_aout, "audio-device" ); - } - if ( var_Type( p_aout, "audio-channels" ) != 0 ) - { - var_Destroy( p_aout, "audio-channels" ); - } + var_Destroy( p_aout, "audio-device" ); + var_Destroy( p_aout, "audio-channels" ); aout_Restart( p_aout ); vlc_object_release( p_aout ); @@ -444,88 +431,40 @@ int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name, * aout_ChannelsRestart : change the audio device or channels and restart *****************************************************************************/ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable, - vlc_value_t old_value, vlc_value_t new_value, - void * unused ) + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; + (void)oldval; (void)newval; (void)p_data; if ( !strcmp( psz_variable, "audio-device" ) ) { /* This is supposed to be a significant change and supposes * rebuilding the channel choices. */ - if ( var_Type( p_aout, "audio-channels" ) >= 0 ) - { - var_Destroy( p_aout, "audio-channels" ); - } + var_Destroy( p_aout, "audio-channels" ); } aout_Restart( p_aout ); return 0; } +#undef aout_EnableFilter /** Enable or disable an audio filter * \param p_this a vlc object * \param psz_name name of the filter * \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 ); - - if( p_aout ) - psz_string = var_GetString( p_aout, "audio-filter" ); - else - psz_string = config_GetPsz( p_this, "audio-filter" ); + aout_instance_t *p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); - if( !psz_string ) psz_string = strdup(""); - - psz_parser = strstr( psz_string, psz_name ); - - if( b_add ) + if( AoutChangeFilterString( p_this, p_aout, "audio-filter", psz_name, 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( 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 ); }