/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: intf.c,v 1.13 2003/01/16 13:22:30 hartman Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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 <vlc_common.h>
+
+#include <stdio.h>
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include <vlc/vlc.h>
-
-#include "audio_output.h"
+#include <vlc_aout.h>
#include "aout_internal.h"
+#include <vlc_playlist.h>
-/*
- * Volume management
- *
- * The hardware volume cannot be set if the output module gets deleted, so
- * we must take the mixer lock. The software volume cannot be set while the
- * mixer is running, so we need the mixer lock (too).
- *
- * Here is a schematic of the i_volume range :
- *
- * |------------------------------+---------------------------------------|
- * 0 pi_soft 1024
- *
- * Between 0 and pi_soft, the volume is done in hardware by the output
- * module. Above, the output module will change p_aout->mixer.i_multiplier
- * (done in software). This scaling may result * in cropping errors and
- * should be avoided as much as possible.
- *
- * It is legal to have *pi_soft == 0, and do everything in software.
- * It is also legal to have *pi_soft == 1024, and completely avoid
- * software scaling. However, some streams (esp. A/52) are encoded with
- * a very low volume and users may complain.
- */
-
-/*****************************************************************************
- * aout_VolumeGet : get the volume of the output device
- *****************************************************************************/
-int aout_VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+static aout_instance_t *findAout (vlc_object_t *obj)
{
- int i_result;
-
- vlc_mutex_lock( &p_aout->mixer_lock );
+ input_thread_t *(*pf_find_input) (vlc_object_t *);
- 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" );
- if (pi_volume != NULL ) *pi_volume = (audio_volume_t)i;
- return 0;
- }
+ pf_find_input = var_GetAddress (obj, "find-input-callback");
+ if (unlikely(pf_find_input == NULL))
+ return NULL;
- i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
+ input_thread_t *p_input = pf_find_input (obj);
+ if (p_input == NULL)
+ return NULL;
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return i_result;
+ aout_instance_t *p_aout = input_GetAout (p_input);
+ vlc_object_release (p_input);
+ return p_aout;
}
+#define findAout(o) findAout(VLC_OBJECT(o))
-/*****************************************************************************
- * aout_VolumeSet : set the volume of the output device
- *****************************************************************************/
-int aout_VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+/** Start a volume change transaction. */
+static void prepareVolume (vlc_object_t *obj, aout_instance_t **aoutp,
+ audio_volume_t *volp, bool *mutep)
{
- int i_result;
-
- 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 );
- config_PutInt( p_aout, "volume", i_volume );
- return 0;
- }
-
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return i_result;
+ aout_instance_t *aout = findAout (obj);
+
+ /* FIXME: we need interlocking even if aout does not exist! */
+ *aoutp = aout;
+ if (aout != NULL)
+ aout_lock_volume (aout);
+ if (volp != NULL)
+ *volp = config_GetInt (obj, "volume");
+ if (mutep != NULL)
+ *mutep = var_GetBool (obj, "mute");
}
-/*****************************************************************************
- * aout_VolumeInfos : get the boundary pi_soft
- *****************************************************************************/
-int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
+/** Commit a volume change transaction. */
+static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
+ audio_volume_t volume, bool mute)
{
- int i_result;
+ int ret = 0;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ config_PutInt (obj, "volume", volume);
+ if (mute)
+ volume = AOUT_VOLUME_MIN;
+ var_SetBool (obj, "mute", mute);
- if ( p_aout->mixer.b_error )
+ if (aout != NULL)
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeInfos called without output module" );
- return -1;
+ aout_lock_mixer (aout);
+ aout_lock_input_fifos (aout);
+ if (aout->p_mixer != NULL)
+ ret = aout->output.pf_volume_set (aout, volume);
+ aout_unlock_input_fifos (aout);
+ aout_unlock_mixer (aout);
+
+ if (ret == 0)
+ var_SetBool (aout, "intf-change", true);
+ aout_unlock_volume (aout);
+ vlc_object_release (aout);
}
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
+ /* trigger callbacks */
+ var_TriggerCallback (obj, "volume-change");
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return i_result;
+ return ret;
}
-/*****************************************************************************
- * 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,
- audio_volume_t * pi_volume )
+#if 0
+/** Cancel a volume change transaction. */
+static void cancelVolume (vlc_object_t *obj, aout_instance_t *aout)
{
- 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 ) )
+ (void) obj;
+ if (aout != NULL)
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
+ aout_unlock_volume (aout);
+ vlc_object_release (aout);
}
-
- 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;
}
+#endif
-/*****************************************************************************
- * 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,
- audio_volume_t * pi_volume )
+#undef aout_VolumeGet
+/**
+ * Gets the volume of the output device (independent of mute).
+ */
+audio_volume_t aout_VolumeGet (vlc_object_t *obj)
{
- 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 0
+ aout_instance_t *aout;
+ audio_volume_t volume;
- if ( pi_volume != NULL ) *pi_volume = i_volume;
- return i_result;
+ prepareVolume (obj, &aout, &volume, NULL);
+ cancelVolume (obj, aout);
+ return 0;
+#else
+ return config_GetInt (obj, "volume");
+#endif
}
-/*****************************************************************************
- * aout_VolumeMute : 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 )
+#undef aout_VolumeSet
+/**
+ * Sets the volume of the output device.
+ * The mute status is not changed.
+ */
+int aout_VolumeSet (vlc_object_t *obj, audio_volume_t volume)
{
- int i_result;
- audio_volume_t i_volume;
-
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_instance_t *aout;
+ bool mute;
- 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;
- }
+ prepareVolume (obj, &aout, NULL, &mute);
+ return commitVolume (obj, aout, volume, mute);
+}
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
- {
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
- }
+#undef aout_VolumeUp
+/**
+ * Raises the volume.
+ * \param volp if non-NULL, will contain contain the resulting volume
+ */
+int aout_VolumeUp (vlc_object_t *obj, int steps, audio_volume_t *volp)
+{
+ aout_instance_t *aout;
+ int ret;
+ int stepsize = var_InheritInteger (obj, "volume-step");
+ audio_volume_t volume;
+ bool mute;
+
+ prepareVolume (obj, &aout, &volume, &mute);
+ volume += stepsize * steps;
+ ret = commitVolume (obj, aout, volume, mute);
+ if (volp != NULL)
+ *volp = volume;
+ return ret;
+}
- if ( i_volume == 0 )
- {
- i_volume = p_aout->output.i_saved_volume;
- }
- else
- {
- p_aout->output.i_saved_volume = i_volume;
- i_volume = 0;
- }
+#undef aout_VolumeDown
+/**
+ * Lowers the volume. See aout_VolumeUp().
+ */
+int aout_VolumeDown (vlc_object_t *obj, int steps, audio_volume_t *volp)
+{
+ return aout_VolumeUp (obj, -steps, volp);
+}
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
+#undef aout_ToggleMute
+/**
+ * Toggles the mute state.
+ */
+int aout_ToggleMute (vlc_object_t *obj, audio_volume_t *volp)
+{
+ aout_instance_t *aout;
+ int ret;
+ audio_volume_t volume;
+ bool mute;
+
+ prepareVolume (obj, &aout, &volume, &mute);
+ mute = !mute;
+ ret = commitVolume (obj, aout, volume, mute);
+ if (volp != NULL)
+ *volp = mute ? AOUT_VOLUME_MIN : volume;
+ return ret;
+}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+/**
+ * Gets the output mute status.
+ */
+bool aout_IsMuted (vlc_object_t *obj)
+{
+#if 0
+ aout_instance_t *aout;
+ bool mute;
+
+ prepareVolume (obj, &aout, NULL, &mute);
+ cancelVolume (obj, aout);
+ return mute;
+#else
+ return var_GetBool (obj, "mute");
+#endif
+}
- if ( pi_volume != NULL ) *pi_volume = i_volume;
- return i_result;
+/**
+ * Sets mute status.
+ */
+int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
+{
+ aout_instance_t *aout;
+ int ret;
+ audio_volume_t volume;
+
+ prepareVolume (obj, &aout, &volume, NULL);
+ ret = commitVolume (obj, aout, volume, mute);
+ if (volp != NULL)
+ *volp = mute ? AOUT_VOLUME_MIN : volume;
+ return ret;
}
/*
{
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;
}
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 )
-{
- *pi_volume = p_aout->output.i_volume;
- return 0;
-}
-
-
/* Placeholder for pf_volume_set(). */
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 )
-{
- 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 );
- 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;
}
-/*****************************************************************************
- * aout_FindAndRestart : find the audio output instance and restart
- *****************************************************************************
- * This is used for callbacks of the configuration variables, and we believe
- * 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 )
-{
- aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
-
- if ( p_aout == NULL ) return;
-
- 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" );
- }
-
- 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,
+ bool b_add )
+{
+ aout_instance_t *p_aout = findAout( p_this );
+
+ if( aout_ChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) )
+ {
+ if( p_aout )
+ AoutInputsMarkToRestart( p_aout );
+ }
+
+ if( p_aout )
+ vlc_object_release( p_aout );
+}