X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fintf.c;h=3fadb4fbc319a891ed5e5ba031d376a34f4b75da;hb=0648b216b13e2dd3ac985ffb737f887a0cc3f446;hp=1407fbe94099ae053b59fbb3c05a504a6d7bf34c;hpb=0bbce5b50d4f6acab7899231b3d4b649dc718d71;p=vlc diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index 1407fbe940..3fadb4fbc3 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -1,8 +1,8 @@ /***************************************************************************** * intf.c : audio output API towards the interface modules ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: intf.c,v 1.14 2003/01/16 14:08:39 massiot Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,20 +18,45 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * 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" +#include + +static aout_instance_t *findAout (vlc_object_t *obj) +{ + input_thread_t *(*pf_find_input) (vlc_object_t *); + + pf_find_input = var_GetAddress (obj, "find-input-callback"); + if (unlikely(pf_find_input == NULL)) + return NULL; + + input_thread_t *p_input = pf_find_input (obj); + if (p_input == NULL) + return NULL; + + aout_instance_t *p_aout = input_GetAout (p_input); + vlc_object_release (p_input); + return p_aout; +} +#define findAout(o) findAout(VLC_OBJECT(o)) /* * Volume management @@ -56,217 +81,222 @@ * a very low volume and users may complain. */ +enum { + SET_MUTE=1, + SET_VOLUME=2, + INCREMENT_VOLUME=4, + TOGGLE_MUTE=8 +}; + /***************************************************************************** - * aout_VolumeGet : get the volume of the output device + * doVolumeChanges : handle all volume changes. Internal use only to ease + * variables locking. *****************************************************************************/ -int aout_VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume ) +static +int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps, + audio_volume_t i_volume, audio_volume_t * i_return_volume, + bool b_mute ) { - int i_result; + int i_result = VLC_SUCCESS; + int i_volume_step = 1, i_new_volume = 0; + bool b_var_mute = false; + aout_instance_t *p_aout = findAout( p_object ); + + if ( p_aout ) aout_lock_volume( p_aout ); + + b_var_mute = (bool)var_GetBool( p_object->p_libvlc, "volume-muted"); + + const bool b_unmute_condition = ( /* Also unmute on increments */ + ( action == INCREMENT_VOLUME ) + || /* On explicit unmute */ + ( ( action == SET_MUTE ) && ( b_var_mute && !b_mute ) ) + || /* On toggle from muted */ + ( ( action == TOGGLE_MUTE ) && b_var_mute ) ); + + const bool b_mute_condition = ( !b_var_mute + && ( /* explicit */ + ( ( action == SET_MUTE ) && b_mute ) + || /* or toggle */ + ( action == TOGGLE_MUTE ) + )); + + /* On UnMute */ + if ( b_unmute_condition ) + { + /* Restore saved volume */ + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc, + "saved-volume" ); + var_SetBool( p_object->p_libvlc, "volume-muted", false ); + } + else if ( b_mute_condition ) + { + /* We need an initial value to backup later */ + i_volume = config_GetInt( p_object, "volume" ); + } + + if ( action == INCREMENT_VOLUME ) + { + i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" ); + + if ( !b_unmute_condition ) + i_volume = config_GetInt( p_object, "volume" ); + + i_new_volume = (int) i_volume + i_volume_step * i_nb_steps; + + if ( i_new_volume > AOUT_VOLUME_MAX ) + i_volume = AOUT_VOLUME_MAX; + else if ( i_new_volume < AOUT_VOLUME_MIN ) + i_volume = AOUT_VOLUME_MIN; + else + i_volume = i_new_volume; + } - vlc_mutex_lock( &p_aout->mixer_lock ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume ); - if ( p_aout->mixer.b_error ) + /* On Mute */ + if ( b_mute_condition ) { - int i; - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - i = config_GetInt( p_aout, "volume" ); - if (pi_volume != NULL ) *pi_volume = (audio_volume_t)i; - return 0; + i_volume = AOUT_VOLUME_MIN; + var_SetBool( p_object->p_libvlc, "volume-muted", true ); } - i_result = p_aout->output.pf_volume_get( p_aout, pi_volume ); + /* Commit volume changes */ + config_PutInt( p_object, "volume", i_volume ); + + if ( p_aout ) + { + aout_lock_mixer( p_aout ); + aout_lock_input_fifos( p_aout ); + if ( p_aout->p_mixer ) + i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); + aout_unlock_input_fifos( p_aout ); + aout_unlock_mixer( p_aout ); + } - vlc_mutex_unlock( &p_aout->mixer_lock ); + /* trigger callbacks */ + var_TriggerCallback( p_object->p_libvlc, "volume-change"); + if ( p_aout ) + { + var_SetBool( p_aout, "intf-change", true ); + aout_unlock_volume( p_aout ); + vlc_object_release( p_aout ); + } + + if ( i_return_volume != NULL ) + *i_return_volume = i_volume; return i_result; } +#undef aout_VolumeGet /***************************************************************************** - * aout_VolumeSet : set the volume of the output device + * aout_VolumeGet : get the volume of the output device *****************************************************************************/ -int aout_VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume ) +int aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume ) { - int i_result; + int i_result = 0; + aout_instance_t * p_aout = findAout( p_object ); - vlc_mutex_lock( &p_aout->mixer_lock ); + if ( pi_volume == NULL ) return -1; - if ( p_aout->mixer.b_error ) + if ( p_aout == NULL ) { - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - config_PutInt( p_aout, "volume", i_volume ); + *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" ); return 0; } - i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); + aout_lock_volume( p_aout ); + aout_lock_mixer( p_aout ); + if ( p_aout->p_mixer ) + { + i_result = p_aout->output.pf_volume_get( p_aout, pi_volume ); + } + else + { + *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" ); + } + aout_unlock_mixer( p_aout ); + aout_unlock_volume( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); + vlc_object_release( p_aout ); return i_result; } +#undef aout_VolumeSet /***************************************************************************** - * aout_VolumeInfos : get the boundary pi_soft + * aout_VolumeSet : set the volume of the output device *****************************************************************************/ -int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) +int aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume ) { - int i_result; - - vlc_mutex_lock( &p_aout->mixer_lock ); - - if ( p_aout->mixer.b_error ) - { - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - msg_Err( p_aout, "VolumeInfos called without output module" ); - return -1; - } - - i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft ); - - vlc_mutex_unlock( &p_aout->mixer_lock ); - return i_result; + return doVolumeChanges( SET_VOLUME, p_object, 1, i_volume, NULL, true ); } +#undef aout_VolumeUp /***************************************************************************** * aout_VolumeUp : raise the output volume ***************************************************************************** * If pi_volume != NULL, *pi_volume will contain the volume at the end of the * function. *****************************************************************************/ -int aout_VolumeUp( aout_instance_t * p_aout, int i_nb_steps, +int aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, audio_volume_t * pi_volume ) { - int i_result; - audio_volume_t i_volume; - - vlc_mutex_lock( &p_aout->mixer_lock ); - - if ( p_aout->mixer.b_error ) - { - int i; - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - i = config_GetInt( p_aout, "volume" ); - i += AOUT_VOLUME_STEP * i_nb_steps; - if ( i > AOUT_VOLUME_MAX ) - { - i = AOUT_VOLUME_MAX; - } - config_PutInt( p_aout, "volume", i ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; - return 0; - } - - if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) ) - { - vlc_mutex_unlock( &p_aout->mixer_lock ); - return -1; - } - - i_volume += AOUT_VOLUME_STEP * i_nb_steps; - if ( i_volume > AOUT_VOLUME_MAX ) i_volume = AOUT_VOLUME_MAX; - - i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); - - vlc_mutex_unlock( &p_aout->mixer_lock ); - - if ( pi_volume != NULL ) *pi_volume = i_volume; - return i_result; + return doVolumeChanges( INCREMENT_VOLUME, p_object, i_nb_steps, 0, pi_volume, true ); } +#undef aout_VolumeDown /***************************************************************************** * aout_VolumeDown : lower the output volume ***************************************************************************** * If pi_volume != NULL, *pi_volume will contain the volume at the end of the * function. *****************************************************************************/ -int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps, +int aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, audio_volume_t * pi_volume ) { - int i_result; - audio_volume_t i_volume; - - vlc_mutex_lock( &p_aout->mixer_lock ); - - if ( p_aout->mixer.b_error ) - { - int i; - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - i = config_GetInt( p_aout, "volume" ); - i -= AOUT_VOLUME_STEP * i_nb_steps; - if ( i < 0 ) - { - i = AOUT_VOLUME_MAX; - } - config_PutInt( p_aout, "volume", i ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; - return 0; - } - - if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) ) - { - vlc_mutex_unlock( &p_aout->mixer_lock ); - return -1; - } - - if ( i_volume < AOUT_VOLUME_STEP * i_nb_steps ) - i_volume = 0; - else - i_volume -= AOUT_VOLUME_STEP * i_nb_steps; - - i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); - - vlc_mutex_unlock( &p_aout->mixer_lock ); - - if ( pi_volume != NULL ) *pi_volume = i_volume; - return i_result; + return aout_VolumeUp( p_object, -i_nb_steps, pi_volume ); } +#undef aout_ToggleMute /***************************************************************************** - * 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( aout_instance_t * p_aout, 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; - - vlc_mutex_lock( &p_aout->mixer_lock ); - - if ( p_aout->mixer.b_error ) - { - /* The output module is destroyed. */ - vlc_mutex_unlock( &p_aout->mixer_lock ); - config_PutInt( p_aout, "volume", 0 ); - if ( pi_volume != NULL ) *pi_volume = 0; - return 0; - } - - if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) ) - { - vlc_mutex_unlock( &p_aout->mixer_lock ); - return -1; - } + return doVolumeChanges( TOGGLE_MUTE, p_object, 1, 0, pi_volume, true ); +} - if ( i_volume == 0 ) - { - i_volume = p_aout->output.i_saved_volume; - } - else +/***************************************************************************** + * aout_IsMuted : Get the output volume mute status + *****************************************************************************/ +bool aout_IsMuted( vlc_object_t * p_object ) +{ + bool b_return_val; + aout_instance_t * p_aout = findAout( p_object ); + if ( p_aout ) aout_lock_volume( p_aout ); + b_return_val = var_GetBool( p_object->p_libvlc, "volume-muted"); + if ( p_aout ) { - p_aout->output.i_saved_volume = i_volume; - i_volume = 0; + aout_unlock_volume( p_aout ); + vlc_object_release( p_aout ); } + return b_return_val; +} - i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); - - vlc_mutex_unlock( &p_aout->mixer_lock ); - - if ( pi_volume != NULL ) *pi_volume = i_volume; - return i_result; +/***************************************************************************** + * aout_SetMute : Sets mute status + ***************************************************************************** + * If pi_volume != NULL, *pi_volume will contain the volume at the end of the + * function (muted => 0). + *****************************************************************************/ +int aout_SetMute( vlc_object_t * p_object, audio_volume_t * pi_volume, + bool b_mute ) +{ + return doVolumeChanges( SET_MUTE, p_object, 1, 0, pi_volume, b_mute ); } /* @@ -279,12 +309,11 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout ) { int i_volume; - p_aout->output.pf_volume_infos = aout_VolumeSoftInfos; p_aout->output.pf_volume_get = aout_VolumeSoftGet; p_aout->output.pf_volume_set = aout_VolumeSoftSet; i_volume = config_GetInt( p_aout, "volume" ); - if ( i_volume < 0 ) + if ( i_volume < AOUT_VOLUME_MIN ) { i_volume = AOUT_VOLUME_DEFAULT; } @@ -296,13 +325,6 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout ) aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume ); } -/* Placeholder for pf_volume_infos(). */ -int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) -{ - *pi_soft = 0; - return 0; -} - /* Placeholder for pf_volume_get(). */ int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume ) { @@ -327,26 +349,21 @@ int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume ) /* Meant to be called by the output plug-in's Open(). */ void aout_VolumeNoneInit( aout_instance_t * p_aout ) { - p_aout->output.pf_volume_infos = aout_VolumeNoneInfos; p_aout->output.pf_volume_get = aout_VolumeNoneGet; p_aout->output.pf_volume_set = aout_VolumeNoneSet; } -/* Placeholder for pf_volume_infos(). */ -int aout_VolumeNoneInfos( aout_instance_t * p_aout, audio_volume_t * 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; } @@ -362,27 +379,30 @@ 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. */ 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_lock_input_fifos( p_aout ); aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); + aout_unlock_input_fifos( p_aout ); } + /* Lock all inputs. */ + aout_lock_input_fifos( p_aout ); aout_MixerDelete( p_aout ); /* Re-open the output plug-in. */ @@ -395,7 +415,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; } @@ -406,7 +427,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; } @@ -414,12 +436,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 ); - vlc_mutex_unlock( &p_input->lock ); + b_error |= aout_InputNew( p_aout, p_input, &p_input->request_vout ); + p_input->b_changed = 1; + 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; } @@ -431,44 +454,60 @@ int aout_Restart( aout_instance_t * p_aout ) * that when those are changed, it is a significant change which implies * rebuilding the audio-device and audio-channels variables. *****************************************************************************/ -void aout_FindAndRestart( vlc_object_t * p_this ) +int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name, + 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 ); + aout_instance_t * p_aout = findAout( pl_Get(p_this) ); - if ( p_aout == NULL ) return; + (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 ); + + return VLC_SUCCESS; } /***************************************************************************** * 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, + bool b_add ) +{ + aout_instance_t *p_aout = findAout( p_this ); + + if( AoutChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) ) + { + if( p_aout ) + AoutInputsMarkToRestart( p_aout ); + } + + if( p_aout ) + vlc_object_release( p_aout ); +}