X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Faudio_output%2Fintf.c;h=a780db6b251674f3bad957e405cf6c4b9ce5aad6;hb=78d87996ccb92d1dc91c9987685f976ed3be08a6;hp=850a5fce76e3ac983b4a19b2ee08e852ba6400f4;hpb=e27abe75a1d2017799af345709d0db0bcb172a36;p=vlc diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index 850a5fce76..a780db6b25 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.17 2003/02/12 14:22:23 hartman Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,21 +18,26 @@ * * 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" - /* * Volume management * @@ -61,12 +66,31 @@ *****************************************************************************/ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume ) { - int i; + int i_result = 0; + aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); - i = config_GetInt( p_object, "volume" ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; + if ( pi_volume == NULL ) return -1; - return 0; + if ( p_aout == NULL ) + { + *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" ); + return 0; + } + + aout_lock_mixer( p_aout ); + if ( !p_aout->mixer.b_error ) + { + 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 ); + + vlc_object_release( p_aout ); + return i_result; } /***************************************************************************** @@ -74,21 +98,22 @@ 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 ) { - aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + 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 ); if ( p_aout == NULL ) 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_set( p_aout, i_volume ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); + var_SetBool( p_aout, "intf-change", true ); vlc_object_release( p_aout ); return i_result; } @@ -104,7 +129,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. */ @@ -114,7 +139,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; @@ -131,26 +156,32 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, { aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - int i_result = 0, i; + int i_result = 0, i_volume = 0, i_volume_step = 0; - i = config_GetInt( p_object, "volume" ); - i += AOUT_VOLUME_STEP * i_nb_steps; - if ( i > AOUT_VOLUME_MAX ) + i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" ); + i_volume = config_GetInt( p_object, "volume" ); + i_volume += i_volume_step * i_nb_steps; + if ( i_volume > AOUT_VOLUME_MAX ) { - i = AOUT_VOLUME_MAX; + i_volume = AOUT_VOLUME_MAX; } - config_PutInt( p_object, "volume", i ); - config_PutInt( p_object, "saved-volume", i ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; + 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_SetBool( p_object->p_libvlc, "volume-change", true ); if ( p_aout == NULL ) 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_set( p_aout, (audio_volume_t)i ); + i_result = p_aout->output.pf_volume_set( p_aout, + (audio_volume_t) i_volume ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); vlc_object_release( p_aout ); return i_result; @@ -167,26 +198,30 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, { aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - int i_result = 0, i; + int i_result = 0, i_volume = 0, i_volume_step = 0; - i = config_GetInt( p_object, "volume" ); - i -= AOUT_VOLUME_STEP * i_nb_steps; - if ( i < AOUT_VOLUME_MIN ) + i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" ); + i_volume = config_GetInt( p_object, "volume" ); + i_volume -= i_volume_step * i_nb_steps; + if ( i_volume < AOUT_VOLUME_MIN ) { - i = AOUT_VOLUME_MIN; + i_volume = AOUT_VOLUME_MIN; } - config_PutInt( p_object, "volume", i ); - config_PutInt( p_object, "saved-volume", i ); - if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; + 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_SetBool( p_object->p_libvlc, "volume-change", true ); if ( p_aout == NULL ) 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_set( p_aout, (audio_volume_t)i ); + i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t) i_volume ); } - vlc_mutex_unlock( &p_aout->mixer_lock ); + aout_unlock_mixer( p_aout ); vlc_object_release( p_aout ); return i_result; @@ -208,13 +243,16 @@ int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume ) { /* Mute */ i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN ); - config_PutInt( p_object, "saved-volume", (int)i_volume ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume ); if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN; } else { /* Un-mute */ - i_volume = (audio_volume_t)config_GetInt( p_object, "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" ); i_result = aout_VolumeSet( p_object, i_volume ); if ( pi_volume != NULL ) *pi_volume = i_volume; } @@ -252,6 +290,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; } @@ -288,18 +327,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; } @@ -315,24 +357,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] ); } @@ -348,7 +392,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; } @@ -359,7 +404,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; } @@ -367,13 +413,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; } @@ -385,12 +431,14 @@ 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 ); - 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 ) { @@ -403,16 +451,19 @@ void aout_FindAndRestart( vlc_object_t * p_this ) 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" ) ) { @@ -426,3 +477,36 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable, aout_Restart( p_aout ); return 0; } + +/** 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 = vlc_object_find( p_this, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + + 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 ); +} + +/** + * Change audio visualization + * -1 goes backwards, +1 goes forward + */ +char *aout_VisualChange( vlc_object_t *p_this, int i_skip ) +{ + (void)p_this; (void)i_skip; + msg_Err( p_this, "FIXME: %s (%s %d) isn't implemented.", __func__, + __FILE__, __LINE__ ); + return strdup("foobar"); +}