/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <stdio.h>
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
+#include <math.h>
#include <vlc_aout.h>
#include "aout_internal.h"
}
#define findAout(o) findAout(VLC_OBJECT(o))
-/** Start a volume change transaction. */
-static void prepareVolume (vlc_object_t *obj, audio_output_t **aoutp,
- audio_volume_t *volp, bool *mutep)
-{
- audio_output_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");
-}
-
-/** Commit a volume change transaction. */
-static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
- audio_volume_t volume, bool mute)
-{
- int ret = 0;
-
- var_SetInteger (obj, "volume", volume);
- var_SetBool (obj, "mute", mute);
-
- if (aout != NULL)
- {
- aout_owner_t *owner = aout_owner (aout);
- float vol = volume / (float)AOUT_VOLUME_DEFAULT;
-
- aout_lock (aout);
- if (owner->module != NULL)
- ret = aout->pf_volume_set (aout, vol, mute);
- aout_unlock (aout);
- aout_unlock_volume (aout);
-
- if (ret == 0)
- var_TriggerCallback (aout, "intf-change");
- vlc_object_release (aout);
- }
- return ret;
-}
-
-#if 0
-/** Cancel a volume change transaction. */
-static void cancelVolume (vlc_object_t *obj, audio_output_t *aout)
-{
- (void) obj;
- if (aout != NULL)
- {
- aout_unlock_volume (aout);
- vlc_object_release (aout);
- }
-}
-#endif
-
#undef aout_VolumeGet
/**
* Gets the volume of the output device (independent of mute).
+ * \return Current audio volume (0 = silent, 1 = nominal),
+ * or a strictly negative value if undefined.
*/
-audio_volume_t aout_VolumeGet (vlc_object_t *obj)
+float aout_VolumeGet (vlc_object_t *obj)
{
-#if 0
- audio_output_t *aout;
- audio_volume_t volume;
+ audio_output_t *aout = findAout (obj);
+ if (aout == NULL)
+ return -1.f;
- prepareVolume (obj, &aout, &volume, NULL);
- cancelVolume (obj, aout);
- return 0;
-#else
- return var_GetInteger (obj, "volume");
-#endif
+ float volume = aout_OutputVolumeGet (aout);
+ vlc_object_release (aout);
+ return 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)
-{
- audio_output_t *aout;
- bool mute;
-
- prepareVolume (obj, &aout, NULL, &mute);
- return commitVolume (obj, aout, volume, mute);
-}
-
-#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
+ * \note The mute status is not changed.
*/
-int aout_VolumeUp (vlc_object_t *obj, int value, audio_volume_t *volp)
+int aout_VolumeSet (vlc_object_t *obj, float vol)
{
- audio_output_t *aout;
- int ret;
- audio_volume_t volume;
- bool mute;
-
- value *= var_InheritInteger (obj, "volume-step");
-
- prepareVolume (obj, &aout, &volume, &mute);
- value += volume;
- if (value < 0)
- volume = 0;
- else
- 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;
-}
+ int ret = -1;
-#undef aout_ToggleMute
-/**
- * Toggles the mute state.
- */
-int aout_ToggleMute (vlc_object_t *obj, audio_volume_t *volp)
-{
- audio_output_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 ? 0 : volume;
+ audio_output_t *aout = findAout (obj);
+ if (aout != NULL)
+ {
+ ret = aout_OutputVolumeSet (aout, vol);
+ vlc_object_release (aout);
+ }
return ret;
}
+#undef aout_MuteGet
/**
* Gets the output mute status.
+ * \return 0 if not muted, 1 if muted, -1 if undefined.
*/
-bool aout_IsMuted (vlc_object_t *obj)
+int aout_MuteGet (vlc_object_t *obj)
{
-#if 0
- audio_output_t *aout;
- bool mute;
+ audio_output_t *aout = findAout (obj);
+ if (aout == NULL)
+ return -1.f;
- prepareVolume (obj, &aout, NULL, &mute);
- cancelVolume (obj, aout);
+ bool mute = aout_OutputMuteGet (aout);
+ vlc_object_release (aout);
return mute;
-#else
- return var_GetBool (obj, "mute");
-#endif
}
+#undef aout_MuteSet
/**
* Sets mute status.
*/
-int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
-{
- audio_output_t *aout;
- int ret;
- audio_volume_t volume;
-
- prepareVolume (obj, &aout, &volume, NULL);
- ret = commitVolume (obj, aout, volume, mute);
- if (volp != NULL)
- *volp = mute ? 0 : volume;
- return ret;
-}
-
-
-/*
- * 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( audio_output_t * p_aout )
-{
- aout_input_t *p_input;
- aout_owner_t *owner = aout_owner (p_aout);
-
- aout_lock( p_aout );
- p_input = owner->input;
- if( p_input == NULL )
- {
- aout_unlock( p_aout );
- msg_Err( p_aout, "no decoder thread" );
- return -1;
- }
-
- /* Reinitializes the output */
- aout_InputDelete( p_aout, p_input );
- aout_MixerDelete (owner->volume.mixer);
- owner->volume.mixer = NULL;
- 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_input->input ) == -1 )
- {
- /* Release all locks and report the error. */
- aout_unlock( p_aout );
- return -1;
- }
-
- owner->volume.mixer = aout_MixerNew (p_aout, owner->mixer_format.i_format);
- if (owner->volume.mixer == NULL)
- {
- aout_OutputDelete( p_aout );
- aout_unlock( p_aout );
- return -1;
- }
-
- if( aout_InputNew( p_aout, p_input, &p_input->request_vout ) )
- {
-#warning FIXME: deal with errors
- aout_unlock( p_aout );
- return -1;
- }
- aout_unlock( p_aout );
- return 0;
-}
-
-/*****************************************************************************
- * 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 )
+int aout_MuteSet (vlc_object_t *obj, bool mute)
{
- audio_output_t * p_aout = (audio_output_t *)p_this;
- (void)oldval; (void)newval; (void)p_data;
+ int ret = -1;
- if ( !strcmp( psz_variable, "audio-device" ) )
+ audio_output_t *aout = findAout (obj);
+ if (aout != NULL)
{
- /* This is supposed to be a significant change and supposes
- * rebuilding the channel choices. */
- var_Destroy( p_aout, "audio-channels" );
+ ret = aout_OutputMuteSet (aout, mute);
+ vlc_object_release (aout);
+ if (ret == 0)
+ var_SetBool (obj, "mute", mute);
}
- aout_Restart( p_aout );
- return 0;
+ return ret;
}
-#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 )
-{
- audio_output_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