/*****************************************************************************
* 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 <massiot@via.ecp.fr>
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <stdio.h>
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <vlc_aout.h>
#include "aout_internal.h"
+#include <vlc_playlist.h>
+
+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
*
* 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( vlc_object_t * p_object, 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 = 0;
- aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
-
- if ( pi_volume == NULL ) return -1;
-
- if ( p_aout == NULL )
+ 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 = var_GetBool( p_object, "volume-muted");
+
+ const bool b_unmute_condition = ( b_var_mute
+ && ( /* Unmute: on increments */
+ ( action == INCREMENT_VOLUME )
+ || /* On explicit unmute */
+ ( ( action == SET_MUTE ) && !b_mute )
+ || /* On toggle from muted */
+ ( action == TOGGLE_MUTE )
+ ));
+
+ const bool b_mute_condition = ( !b_var_mute
+ && ( /* explicit */
+ ( ( action == SET_MUTE ) && b_mute )
+ || /* or toggle */
+ ( action == TOGGLE_MUTE )
+ ));
+
+ /* If muting or unmuting when play hasn't started */
+ if ( action == SET_MUTE && !b_unmute_condition && !b_mute_condition )
{
- *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
- return 0;
+ if ( p_aout )
+ {
+ aout_unlock_volume( p_aout );
+ vlc_object_release( p_aout );
+ }
+ return i_result;
}
- vlc_mutex_lock( &p_aout->mixer_lock );
- if ( !p_aout->mixer.b_error )
+ /* On UnMute */
+ if ( b_unmute_condition )
{
- i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
+ /* Restore saved volume */
+ i_volume = var_GetInteger( p_object, "saved-volume" );
+ var_SetBool( p_object, "volume-muted", false );
}
- else
+ else if ( b_mute_condition )
{
- *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ /* We need an initial value to backup later */
+ i_volume = config_GetInt( p_object, "volume" );
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
- vlc_object_release( p_aout );
- return i_result;
-}
+ if ( action == INCREMENT_VOLUME )
+ {
+ i_volume_step = var_InheritInteger( p_object, "volume-step" );
-/*****************************************************************************
- * aout_VolumeSet : set the volume of the output device
- *****************************************************************************/
-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;
+ if ( !b_unmute_condition )
+ i_volume = config_GetInt( p_object, "volume" );
- config_PutInt( p_object, "volume", i_volume );
+ i_new_volume = (int) i_volume + i_volume_step * i_nb_steps;
- val.b_bool = VLC_TRUE;
- var_Set( p_object->p_libvlc, "volume-change", val );
+ 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;
+ }
- if ( p_aout == NULL ) return 0;
+ var_SetInteger( p_object, "saved-volume" , i_volume );
- vlc_mutex_lock( &p_aout->mixer_lock );
- if ( !p_aout->mixer.b_error )
+ /* On Mute */
+ if ( b_mute_condition )
{
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
+ i_volume = AOUT_VOLUME_MIN;
+ var_SetBool( p_object, "volume-muted", true );
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
- var_Set( p_aout, "intf-change", val );
- vlc_object_release( p_aout );
+ /* 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 );
+ }
+
+ /* trigger callbacks */
+ var_TriggerCallback( p_object, "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_VolumeInfos : get the boundary pi_soft
+ * aout_VolumeGet : get the volume of the output device
*****************************************************************************/
-int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
+int aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
- aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- int i_result;
+ int i_result = 0;
+ aout_instance_t * p_aout = findAout( p_object );
- if ( p_aout == NULL ) return 0;
+ if ( pi_volume == NULL ) return -1;
+
+ if ( p_aout == NULL )
+ {
+ *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ return 0;
+ }
- vlc_mutex_lock( &p_aout->mixer_lock );
- if ( p_aout->mixer.b_error )
+ aout_lock_volume( p_aout );
+ aout_lock_mixer( p_aout );
+ if ( p_aout->p_mixer )
{
- /* The output module is destroyed. */
- i_result = -1;
+ i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
}
else
{
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
+ *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
+ aout_unlock_volume( p_aout );
vlc_object_release( p_aout );
return i_result;
}
+#undef aout_VolumeSet
+/*****************************************************************************
+ * aout_VolumeSet : set the volume of the output device
+ *****************************************************************************/
+int aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
+{
+ 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( vlc_object_t * p_object, int i_nb_steps,
+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_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_volume = AOUT_VOLUME_MAX;
- }
- config_PutInt( p_object, "volume", i_volume );
- var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc_global, "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 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( 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_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_volume = AOUT_VOLUME_MIN;
- }
- config_PutInt( p_object, "volume", i_volume );
- var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc_global, "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 );
}
+#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( 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;
+ return doVolumeChanges( TOGGLE_MUTE, p_object, 1, 0, pi_volume, true );
+}
- i_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
- if ( i_volume != 0 )
- {
- /* Mute */
- i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
- var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
- if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
- }
- 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, "volume-muted");
+ if ( p_aout )
{
- /* Un-mute */
- var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
- i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
- "saved-volume" );
- i_result = aout_VolumeSet( p_object, i_volume );
- if ( pi_volume != NULL ) *pi_volume = i_volume;
+ aout_unlock_volume( p_aout );
+ vlc_object_release( p_aout );
}
+ return b_return_val;
+}
- 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 );
}
/*
{
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;
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 )
{
/* 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;
}
* 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. */
{
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;
}
{
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;
}
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;
}
* 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 );
+ aout_instance_t * p_aout = findAout( pl_Get(p_this) );
+ (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 );
* 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" );
-
- if( !psz_string ) psz_string = strdup("");
-
- psz_parser = strstr( psz_string, psz_name );
+ aout_instance_t *p_aout = findAout( p_this );
- if( b_add )
+ if( aout_ChangeFilterString( 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 );
-}
-
-/**
- * Change audio visualization
- * -1 goes backwards, +1 goes forward
- */
-char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
-{
- return strdup("foobar");
}
projects / vlc / blobdiff