#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( vlc_object_t * p_object, audio_volume_t * pi_volume )
+static aout_instance_t *findAout (vlc_object_t *obj)
{
- int i_result = 0;
- aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ input_thread_t *(*pf_find_input) (vlc_object_t *);
- if ( pi_volume == NULL ) return -1;
+ pf_find_input = var_GetAddress (obj, "find-input-callback");
+ if (unlikely(pf_find_input == NULL))
+ return NULL;
- if ( p_aout == NULL )
- {
- *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
- return 0;
- }
+ input_thread_t *p_input = pf_find_input (obj);
+ if (p_input == NULL)
+ return NULL;
- aout_lock_mixer( p_aout );
- if ( !p_aout->mixer.b_error )
- {
- i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
- }
- else
- {
- *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
- }
- aout_unlock_mixer( p_aout );
-
- vlc_object_release( p_aout );
- 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( vlc_object_t * p_object, 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)
{
- config_PutInt( p_object, "volume", i_volume );
- var_SetBool( p_object->p_libvlc, "volume-change", true );
-
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume );
-
- aout_instance_t *p_aout = vlc_object_find( p_object,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
- if ( p_aout == NULL )
- return VLC_SUCCESS;
-
- int i_result = VLC_SUCCESS;
- aout_lock_mixer( p_aout );
-
- if ( !p_aout->mixer.b_error )
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
- aout_unlock_mixer( p_aout );
-
- var_SetBool( p_aout, "intf-change", true );
- vlc_object_release( p_aout );
- 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_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,
- audio_volume_t * pi_volume )
+/** Commit a volume change transaction. */
+static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
+ audio_volume_t volume, bool mute)
{
+ int ret = 0;
- const int i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
-
- int i_volume = config_GetInt( p_object, "volume" ) +
- i_volume_step * i_nb_steps;
- if ( i_volume > AOUT_VOLUME_MAX )
- i_volume = AOUT_VOLUME_MAX;
- else if ( i_volume < AOUT_VOLUME_MIN )
- i_volume = AOUT_VOLUME_MIN;
- if ( pi_volume != NULL )
- *pi_volume = i_volume;
+ var_SetInteger (obj, "volume", volume);
+ var_SetBool (obj, "mute", mute);
- return __aout_VolumeSet( p_object, i_volume );
+ if (aout != NULL)
+ {
+ 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);
+ }
+ return ret;
}
-/*****************************************************************************
- * 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,
- audio_volume_t * pi_volume )
+#if 0
+/** Cancel a volume change transaction. */
+static void cancelVolume (vlc_object_t *obj, aout_instance_t *aout)
{
- return __aout_VolumeUp( p_object, -i_nb_steps, pi_volume );
+ (void) obj;
+ if (aout != NULL)
+ {
+ aout_unlock_volume (aout);
+ vlc_object_release (aout);
+ }
}
+#endif
-/*****************************************************************************
- * 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_ToggleMute( vlc_object_t * p_object, 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;
-
- 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, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
- if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
- }
- else
- {
- /* Un-mute */
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
- "saved-volume" );
- i_result = aout_VolumeSet( p_object, i_volume );
- if ( pi_volume != NULL ) *pi_volume = i_volume;
- }
+#if 0
+ aout_instance_t *aout;
+ audio_volume_t volume;
- return i_result;
+ prepareVolume (obj, &aout, &volume, NULL);
+ cancelVolume (obj, aout);
+ return 0;
+#else
+ return var_GetInteger (obj, "volume");
+#endif
}
-/*
- * The next functions are not supposed to be called by the interface, but
- * are placeholders for software-only scaling.
+#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)
+{
+ aout_instance_t *aout;
+ bool mute;
-/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeSoftInit( aout_instance_t * p_aout )
+ 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
+ */
+int aout_VolumeUp (vlc_object_t *obj, int value, audio_volume_t *volp)
{
- int i_volume;
+ aout_instance_t *aout;
+ int ret;
+ audio_volume_t volume;
+ bool mute;
- p_aout->output.pf_volume_get = aout_VolumeSoftGet;
- p_aout->output.pf_volume_set = aout_VolumeSoftSet;
+ value *= var_InheritInteger (obj, "volume-step");
- i_volume = config_GetInt( p_aout, "volume" );
- if ( i_volume < AOUT_VOLUME_MIN )
- {
- i_volume = AOUT_VOLUME_DEFAULT;
- }
- else if ( i_volume > AOUT_VOLUME_MAX )
- {
- i_volume = AOUT_VOLUME_MAX;
- }
+ prepareVolume (obj, &aout, &volume, &mute);
+ value += volume;
+ if (value < AOUT_VOLUME_MIN)
+ volume = AOUT_VOLUME_MIN;
+ 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;
+}
- aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
+#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);
}
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+#undef aout_ToggleMute
+/**
+ * Toggles the mute state.
+ */
+int aout_ToggleMute (vlc_object_t *obj, audio_volume_t *volp)
{
- *pi_volume = p_aout->output.i_volume;
- return 0;
+ 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;
}
+/**
+ * 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
+}
-/* Placeholder for pf_volume_set(). */
-int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+/**
+ * Sets mute status.
+ */
+int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
{
- aout_MixerMultiplierSet( p_aout, (float)i_volume / AOUT_VOLUME_DEFAULT );
- p_aout->output.i_volume = 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;
}
+
/*
* The next functions are not supposed to be called by the interface, but
- * are placeholders for unsupported scaling.
+ * are placeholders for software-only scaling.
*/
+static int aout_VolumeSoftSet (aout_instance_t *aout, audio_volume_t volume,
+ bool mute)
+{
+ 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_VolumeNoneInit( aout_instance_t * p_aout )
+void aout_VolumeSoftInit (aout_instance_t *aout)
{
- p_aout->output.pf_volume_get = aout_VolumeNoneGet;
- p_aout->output.pf_volume_set = aout_VolumeNoneSet;
+ 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);
}
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+
+/*
+ * 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)p_aout; (void)pi_volume;
+ (void)aout; (void)volume; (void)mute;
return -1;
}
-/* Placeholder for pf_volume_set(). */
-int aout_VolumeNoneSet( 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 )
{
- (void)p_aout; (void)i_volume;
- return -1;
+ p_aout->output.pf_volume_set = aout_VolumeNoneSet;
}
*****************************************************************************/
static int aout_Restart( aout_instance_t * p_aout )
{
- int i;
bool b_error = 0;
aout_lock_mixer( p_aout );
- if ( p_aout->i_nb_inputs == 0 )
+ if( p_aout->p_input == NULL )
{
aout_unlock_mixer( p_aout );
msg_Err( p_aout, "no decoder thread" );
return -1;
}
- /* Lock all inputs. */
+ 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 );
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- aout_lock_input( p_aout, p_aout->pp_inputs[i] );
- aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
- }
-
+ /* Lock all inputs. */
+ aout_lock_input_fifos( p_aout );
aout_MixerDelete( p_aout );
/* Re-open the output plug-in. */
aout_OutputDelete( p_aout );
- if ( aout_OutputNew( p_aout, &p_aout->pp_inputs[0]->input ) == -1 )
+ /* 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. */
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
- }
+ 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 );
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
- }
+ vlc_mutex_unlock( &p_aout->p_input->lock );
aout_unlock_input_fifos( p_aout );
aout_unlock_mixer( p_aout );
return -1;
}
- /* Re-open all inputs. */
- 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, &p_input->request_vout );
- p_input->b_changed = 1;
- aout_unlock_input( p_aout, p_input );
- }
+ /* 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;
}
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
- 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 );
-
- (void)psz_name; (void)oldval; (void)newval; (void)p_data;
- if ( p_aout == NULL ) return VLC_SUCCESS;
-
- var_Destroy( p_aout, "audio-device" );
- var_Destroy( p_aout, "audio-channels" );
-
- aout_Restart( p_aout );
- vlc_object_release( p_aout );
-
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* aout_ChannelsRestart : change the audio device or channels and restart
*****************************************************************************/
void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
bool b_add )
{
- aout_instance_t *p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ aout_instance_t *p_aout = findAout( p_this );
- if( AoutChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) )
+ if( aout_ChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) )
{
if( p_aout )
AoutInputsMarkToRestart( p_aout );