X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fintf.c;h=b598ea4f69298c51a28ccc9e5febeee3b53524c3;hb=76922217d4efe2fdf12e7bfcca5172b21a78ec70;hp=b23bde8737c1974d4997bdae938203f952277c5a;hpb=3ddfd217080e88775d3769dace2b0f09c335d984;p=vlc diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index b23bde8737..b598ea4f69 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.12 2003/01/15 11:27:29 massiot Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: intf.c,v 1.20 2004/01/06 12:02:05 zorglub Exp $ * * Authors: Christophe Massiot * @@ -59,69 +59,68 @@ /***************************************************************************** * aout_VolumeGet : get the volume of the output device *****************************************************************************/ -int aout_VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume ) +int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_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, "VolumeGet called without output module" ); - return -1; - } + int i; - i_result = p_aout->output.pf_volume_get( p_aout, pi_volume ); + i = config_GetInt( p_object, "volume" ); + if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; - vlc_mutex_unlock( &p_aout->mixer_lock ); - return i_result; + return 0; } /***************************************************************************** * aout_VolumeSet : set the volume of the output device *****************************************************************************/ -int aout_VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume ) +int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume ) { - int i_result; + vlc_value_t val; + aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + int i_result = 0; - vlc_mutex_lock( &p_aout->mixer_lock ); + config_PutInt( p_object, "volume", i_volume ); - if ( p_aout->mixer.b_error ) + if ( p_aout == NULL ) return 0; + + 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, "VolumeSet called without output module" ); - return -1; + i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); } + vlc_mutex_unlock( &p_aout->mixer_lock ); - i_result = p_aout->output.pf_volume_set( p_aout, i_volume ); + vlc_object_release( p_aout ); - vlc_mutex_unlock( &p_aout->mixer_lock ); + val.b_bool = VLC_TRUE; + var_Set( p_aout, "intf-change", val ); return i_result; } /***************************************************************************** * aout_VolumeInfos : get the boundary pi_soft *****************************************************************************/ -int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) +int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft ) { + aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); int i_result; - vlc_mutex_lock( &p_aout->mixer_lock ); + if ( p_aout == NULL ) return 0; + 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 = -1; + } + else + { + i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft ); } - - i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft ); - vlc_mutex_unlock( &p_aout->mixer_lock ); + + vlc_object_release( p_aout ); return i_result; } @@ -131,44 +130,33 @@ int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft ) * 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 ); + aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + int i_result = 0, i; - if ( p_aout->mixer.b_error ) + i = config_GetInt( p_object, "volume" ); + i += AOUT_VOLUME_STEP * i_nb_steps; + if ( i > AOUT_VOLUME_MAX ) { - 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; + i = 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; + + if ( p_aout == NULL ) return 0; - if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) ) + vlc_mutex_lock( &p_aout->mixer_lock ); + if ( !p_aout->mixer.b_error ) { - vlc_mutex_unlock( &p_aout->mixer_lock ); - return -1; + i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t)i ); } - - 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; + vlc_object_release( p_aout ); return i_result; } @@ -178,46 +166,33 @@ int aout_VolumeUp( aout_instance_t * p_aout, int i_nb_steps, * 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 ); + aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + int i_result = 0, i; - if ( p_aout->mixer.b_error ) + i = config_GetInt( p_object, "volume" ); + i -= AOUT_VOLUME_STEP * i_nb_steps; + if ( i < AOUT_VOLUME_MIN ) { - 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; + i = 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; + + if ( p_aout == NULL ) return 0; - if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) ) + vlc_mutex_lock( &p_aout->mixer_lock ); + if ( !p_aout->mixer.b_error ) { - vlc_mutex_unlock( &p_aout->mixer_lock ); - return -1; + i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t)i ); } - - 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; + vlc_object_release( p_aout ); return i_result; } @@ -227,44 +202,27 @@ int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps, * 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_VolumeMute( 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 ) + i_volume = (audio_volume_t)config_GetInt( p_object, "volume" ); + if ( i_volume != 0 ) { - int i; - /* 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; - } - - if ( i_volume == 0 ) - { - i_volume = p_aout->output.i_saved_volume; + /* Mute */ + i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN ); + config_PutInt( p_object, "saved-volume", (int)i_volume ); + if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN; } else { - p_aout->output.i_saved_volume = i_volume; - i_volume = 0; + /* Un-mute */ + i_volume = (audio_volume_t)config_GetInt( p_object, "saved-volume" ); + i_result = aout_VolumeSet( p_object, i_volume ); + if ( pi_volume != NULL ) *pi_volume = i_volume; } - 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; } @@ -283,7 +241,7 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout ) 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; } @@ -415,6 +373,7 @@ int aout_Restart( aout_instance_t * p_aout ) aout_input_t * p_input = p_aout->pp_inputs[i]; b_error |= aout_InputNew( p_aout, p_input ); + p_input->b_changed = 1; vlc_mutex_unlock( &p_input->lock ); } @@ -430,12 +389,13 @@ 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 val, void *p_data ) { aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if ( p_aout == NULL ) return; + if ( p_aout == NULL ) return VLC_SUCCESS; if ( var_Type( p_aout, "audio-device" ) != 0 ) { @@ -448,6 +408,8 @@ void aout_FindAndRestart( vlc_object_t * p_this ) aout_Restart( p_aout ); vlc_object_release( p_aout ); + + return VLC_SUCCESS; } /*****************************************************************************