/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: intf.c,v 1.3 2002/09/19 21:56:40 massiot Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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"
-/*
- * 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.
- */
+#include <vlc_playlist.h>
-/*****************************************************************************
- * 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;
+ input_thread_t *(*pf_find_input) (vlc_object_t *);
- vlc_mutex_lock( &p_aout->mixer_lock );
-
- if ( p_aout->i_nb_inputs == 0 )
- {
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeGet called without output module" );
- return -1;
- }
+ 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->i_nb_inputs == 0 )
- {
- /* 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 );
- 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 = var_GetInteger (obj, "volume");
+ if (mutep != NULL)
+ *mutep = var_GetBool (obj, "mute");
}
-/*****************************************************************************
- * aout_VolumeInfos : get the boundaries pi_low_soft and pi_high_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 );
+ var_SetInteger (obj, "volume", volume);
+ var_SetBool (obj, "mute", mute);
- if ( p_aout->i_nb_inputs == 0 )
+ 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, mute);
+ aout_unlock_input_fifos (aout);
+ aout_unlock_mixer (aout);
+
+ if (ret == 0)
+ var_TriggerCallback (aout, "intf-change");
+ aout_unlock_volume (aout);
+ vlc_object_release (aout);
}
-
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
-
- 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->i_nb_inputs == 0 )
+ (void) obj;
+ if (aout != NULL)
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
+ aout_unlock_volume (aout);
+ vlc_object_release (aout);
}
+}
+#endif
- 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 > 1024 ) i_volume = 1024;
-
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
- vlc_mutex_unlock( &p_aout->mixer_lock );
+#undef aout_VolumeGet
+/**
+ * Gets the volume of the output device (independent of mute).
+ */
+audio_volume_t aout_VolumeGet (vlc_object_t *obj)
+{
+#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 var_GetInteger (obj, "volume");
+#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_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;
+ aout_instance_t *aout;
+ bool mute;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ prepareVolume (obj, &aout, NULL, &mute);
+ return commitVolume (obj, aout, volume, mute);
+}
- if ( p_aout->i_nb_inputs == 0 )
- {
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
- }
+#undef aout_VolumeUp
+/**
+ * Raises the volume.
+ * \param value how much to increase (> 0) or decrease (< 0) the volume
+ * \param volp if non-NULL, will contain contain the resulting volume
+ */
+int aout_VolumeUp (vlc_object_t *obj, int value, audio_volume_t *volp)
+{
+ aout_instance_t *aout;
+ int ret;
+ audio_volume_t volume;
+ bool mute;
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
- {
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
- }
+ value *= var_InheritInteger (obj, "volume-step");
- if ( i_volume < AOUT_VOLUME_STEP * i_nb_steps )
- i_volume = 0;
+ prepareVolume (obj, &aout, &volume, &mute);
+ value += volume;
+ if (value < AOUT_VOLUME_MIN)
+ volume = AOUT_VOLUME_MIN;
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;
+ if (value > AOUT_VOLUME_MAX)
+ volume = AOUT_VOLUME_MAX;
+ else
+ volume = value;
+ ret = commitVolume (obj, aout, volume, mute);
+ if (volp != NULL)
+ *volp = volume;
+ return ret;
}
-/*
- * The next functions are not supposed to be called by the interface, but
- * are placeholders for software-only scaling.
+#undef aout_VolumeDown
+/**
+ * Lowers the volume. See aout_VolumeUp().
*/
-
-/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeSoftInit( aout_instance_t * p_aout )
+int aout_VolumeDown (vlc_object_t *obj, int steps, audio_volume_t *volp)
{
- 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 == -1 )
- {
- i_volume = AOUT_VOLUME_DEFAULT;
- }
+ return aout_VolumeUp (obj, -steps, volp);
+}
- aout_VolumeSoftSet( 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;
}
-/* Placeholder for pf_volume_infos(). */
-int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
+/**
+ * Gets the output mute status.
+ */
+bool aout_IsMuted (vlc_object_t *obj)
{
- *pi_soft = 0;
- return 0;
+#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
}
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+/**
+ * Sets mute status.
+ */
+int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
{
- *pi_volume = p_aout->output.i_volume;
- return 0;
+ 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;
}
-/* Placeholder for pf_volume_set(). */
-int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+/*
+ * The next functions are not supposed to be called by the interface, but
+ * are placeholders for software-only scaling.
+ */
+static int aout_VolumeSoftSet (aout_instance_t *aout, audio_volume_t volume,
+ bool mute)
{
- aout_MixerMultiplierSet( p_aout, (float)i_volume / AOUT_VOLUME_DEFAULT );
- p_aout->output.i_volume = i_volume;
+ float f = mute ? 0. : (volume / (float)AOUT_VOLUME_DEFAULT);
+ aout->mixer_multiplier = f;
return 0;
}
+/* Meant to be called by the output plug-in's Open(). */
+void aout_VolumeSoftInit (aout_instance_t *aout)
+{
+ audio_volume_t volume = var_InheritInteger (aout, "volume");
+ bool mute = var_InheritBool (aout, "mute");
+
+ aout->output.pf_volume_set = aout_VolumeSoftSet;
+ aout_VolumeSoftSet (aout, volume, mute);
+}
+
+
/*
* The next functions are not supposed to be called by the interface, but
* are placeholders for unsupported scaling.
*/
+static int aout_VolumeNoneSet (aout_instance_t *aout, audio_volume_t volume,
+ bool mute)
+{
+ (void)aout; (void)volume; (void)mute;
+ return -1;
+}
/* 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 )
+
+/*
+ * Pipelines management
+ */
+
+/*****************************************************************************
+ * aout_Restart : re-open the output device and rebuild the input and output
+ * pipelines
+ *****************************************************************************
+ * This function is used whenever the parameters of the output plug-in are
+ * changed (eg. selecting S/PDIF or PCM).
+ *****************************************************************************/
+static int aout_Restart( aout_instance_t * p_aout )
{
- return -1;
+ bool b_error = 0;
+
+ aout_lock_mixer( p_aout );
+
+ if( p_aout->p_input == NULL )
+ {
+ aout_unlock_mixer( p_aout );
+ msg_Err( p_aout, "no decoder thread" );
+ return -1;
+ }
+
+ aout_lock_input( p_aout, p_aout->p_input );
+ aout_lock_input_fifos( p_aout );
+ aout_InputDelete( p_aout, p_aout->p_input );
+ 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. */
+ aout_OutputDelete( p_aout );
+
+ /* FIXME: This function is notoriously dangerous/unsafe.
+ * By the way, if OutputNew or MixerNew fails, we are totally screwed. */
+ if ( aout_OutputNew( p_aout, &p_aout->p_input->input ) == -1 )
+ {
+ /* Release all locks and report the error. */
+ vlc_mutex_unlock( &p_aout->p_input->lock );
+ aout_unlock_input_fifos( p_aout );
+ aout_unlock_mixer( p_aout );
+ return -1;
+ }
+
+ if ( aout_MixerNew( p_aout ) == -1 )
+ {
+ aout_OutputDelete( p_aout );
+ vlc_mutex_unlock( &p_aout->p_input->lock );
+ aout_unlock_input_fifos( p_aout );
+ aout_unlock_mixer( p_aout );
+ return -1;
+ }
+
+ /* Re-open the input. */
+ aout_input_t * p_input = p_aout->p_input;
+ b_error |= aout_InputNew( p_aout, p_input, &p_input->request_vout );
+ aout_unlock_input( p_aout, p_input );
+
+ aout_unlock_input_fifos( p_aout );
+ aout_unlock_mixer( p_aout );
+
+ return b_error;
}
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+/*****************************************************************************
+ * 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 oldval, vlc_value_t newval,
+ void *p_data )
{
- return -1;
-}
+ 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. */
+ var_Destroy( p_aout, "audio-channels" );
+ }
+ aout_Restart( p_aout );
+ return 0;
+}
-/* Placeholder for pf_volume_set(). */
-int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+#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 )
{
- return -1;
-}
+ 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 );
+}
projects / vlc / blobdiff