#endif
#include <vlc_common.h>
+#include <vlc_aout_intf.h>
#include <stdio.h>
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <vlc_playlist.h>
-static aout_instance_t *findAout (vlc_object_t *obj)
+static audio_output_t *findAout (vlc_object_t *obj)
{
input_thread_t *(*pf_find_input) (vlc_object_t *);
if (p_input == NULL)
return NULL;
- aout_instance_t *p_aout = input_GetAout (p_input);
+ audio_output_t *p_aout = input_GetAout (p_input);
vlc_object_release (p_input);
return p_aout;
}
#define findAout(o) findAout(VLC_OBJECT(o))
/** Start a volume change transaction. */
-static void prepareVolume (vlc_object_t *obj, aout_instance_t **aoutp,
+static void prepareVolume (vlc_object_t *obj, audio_output_t **aoutp,
audio_volume_t *volp, bool *mutep)
{
- aout_instance_t *aout = findAout (obj);
+ 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 = config_GetInt (obj, "volume");
+ *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, aout_instance_t *aout,
+static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
audio_volume_t volume, bool mute)
{
int ret = 0;
- config_PutInt (obj, "volume", volume);
- if (mute)
- volume = AOUT_VOLUME_MIN;
+ var_SetInteger (obj, "volume", volume);
var_SetBool (obj, "mute", mute);
if (aout != NULL)
{
- aout_lock_mixer (aout);
- aout_lock_input_fifos (aout);
+ float vol = volume / (float)AOUT_VOLUME_DEFAULT;
+
+ aout_lock (aout);
+#warning FIXME: wrong test. Need to check that aout_output is ready.
if (aout->p_mixer != NULL)
- ret = aout->output.pf_volume_set (aout, volume);
- aout_unlock_input_fifos (aout);
- aout_unlock_mixer (aout);
+ ret = aout->pf_volume_set (aout, vol, mute);
+ aout_unlock (aout);
if (ret == 0)
- var_SetBool (aout, "intf-change", true);
+ var_TriggerCallback (aout, "intf-change");
aout_unlock_volume (aout);
vlc_object_release (aout);
}
-
- /* trigger callbacks */
- var_TriggerCallback (obj, "volume-change");
-
return ret;
}
#if 0
/** Cancel a volume change transaction. */
-static void cancelVolume (vlc_object_t *obj, aout_instance_t *aout)
+static void cancelVolume (vlc_object_t *obj, audio_output_t *aout)
{
(void) obj;
if (aout != NULL)
audio_volume_t aout_VolumeGet (vlc_object_t *obj)
{
#if 0
- aout_instance_t *aout;
+ audio_output_t *aout;
audio_volume_t volume;
prepareVolume (obj, &aout, &volume, NULL);
cancelVolume (obj, aout);
return 0;
#else
- return config_GetInt (obj, "volume");
+ return var_GetInteger (obj, "volume");
#endif
}
*/
int aout_VolumeSet (vlc_object_t *obj, audio_volume_t volume)
{
- aout_instance_t *aout;
+ audio_output_t *aout;
bool mute;
prepareVolume (obj, &aout, NULL, &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 steps, audio_volume_t *volp)
+int aout_VolumeUp (vlc_object_t *obj, int value, audio_volume_t *volp)
{
- aout_instance_t *aout;
+ audio_output_t *aout;
int ret;
- int stepsize = var_InheritInteger (obj, "volume-step");
audio_volume_t volume;
bool mute;
+ value *= var_InheritInteger (obj, "volume-step");
+
prepareVolume (obj, &aout, &volume, &mute);
- volume += stepsize * steps;
+ 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;
*/
int aout_ToggleMute (vlc_object_t *obj, audio_volume_t *volp)
{
- aout_instance_t *aout;
+ audio_output_t *aout;
int ret;
audio_volume_t volume;
bool mute;
bool aout_IsMuted (vlc_object_t *obj)
{
#if 0
- aout_instance_t *aout;
+ audio_output_t *aout;
bool mute;
prepareVolume (obj, &aout, NULL, &mute);
*/
int aout_SetMute (vlc_object_t *obj, audio_volume_t *volp, bool mute)
{
- aout_instance_t *aout;
+ audio_output_t *aout;
int ret;
audio_volume_t volume;
return ret;
}
+
/*
* The next functions are not supposed to be called by the interface, but
* are placeholders for software-only scaling.
*/
+static int aout_VolumeSoftSet (audio_output_t *aout, float volume, bool mute)
+{
+ aout->mixer_multiplier = mute ? 0. : volume;
+ return 0;
+}
/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeSoftInit( aout_instance_t * p_aout )
+void aout_VolumeSoftInit (audio_output_t *aout)
{
- int i_volume;
-
- p_aout->output.pf_volume_set = aout_VolumeSoftSet;
-
- 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;
- }
+ audio_volume_t volume = var_InheritInteger (aout, "volume");
+ bool mute = var_InheritBool (aout, "mute");
- aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
+ aout->pf_volume_set = aout_VolumeSoftSet;
+ aout_VolumeSoftSet (aout, volume / (float)AOUT_VOLUME_DEFAULT, mute);
}
-/* Placeholder for pf_volume_set(). */
-int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume )
-{
- aout_MixerMultiplierSet( p_aout, (float)i_volume / AOUT_VOLUME_DEFAULT );
- p_aout->output.i_volume = i_volume;
- return 0;
-}
/*
* The next functions are not supposed to be called by the interface, but
* are placeholders for unsupported scaling.
*/
-
-/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeNoneInit( aout_instance_t * p_aout )
+static int aout_VolumeNoneSet (audio_output_t *aout, float volume, bool mute)
{
- p_aout->output.pf_volume_set = aout_VolumeNoneSet;
+ (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( audio_output_t * p_aout )
{
- (void)p_aout; (void)i_volume;
- return -1;
+ p_aout->pf_volume_set = aout_VolumeNoneSet;
}
* 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 )
+static int aout_Restart( audio_output_t * p_aout )
{
- int i;
- bool b_error = 0;
-
- aout_lock_mixer( p_aout );
+ aout_input_t *p_input;
- if ( p_aout->i_nb_inputs == 0 )
+ aout_lock( p_aout );
+ p_input = p_aout->p_input;
+ if( p_input == NULL )
{
- aout_unlock_mixer( p_aout );
+ aout_unlock( p_aout );
msg_Err( p_aout, "no decoder thread" );
return -1;
}
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- 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 );
+ /* Reinitializes the output */
+ aout_InputDelete( p_aout, p_input );
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_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 );
- }
- aout_unlock_input_fifos( p_aout );
- aout_unlock_mixer( p_aout );
+ aout_unlock( 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 );
- }
- aout_unlock_input_fifos( p_aout );
- aout_unlock_mixer( p_aout );
+ aout_unlock( p_aout );
return -1;
}
- /* Re-open all inputs. */
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
+ if( aout_InputNew( p_aout, p_input, &p_input->request_vout ) )
{
- 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 );
+#warning FIXME: deal with errors
+ aout_unlock( p_aout );
+ return -1;
}
-
- aout_unlock_input_fifos( p_aout );
- aout_unlock_mixer( p_aout );
-
- return b_error;
+ aout_unlock( p_aout );
+ return 0;
}
/*****************************************************************************
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- aout_instance_t * p_aout = (aout_instance_t *)p_this;
+ audio_output_t * p_aout = (audio_output_t *)p_this;
(void)oldval; (void)newval; (void)p_data;
if ( !strcmp( psz_variable, "audio-device" ) )
void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
bool b_add )
{
- aout_instance_t *p_aout = findAout( p_this );
+ audio_output_t *p_aout = findAout( p_this );
if( aout_ChangeFilterString( p_this, p_aout, "audio-filter", psz_name, b_add ) )
{
projects / vlc / blobdiff