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, "volume-muted");
+ *mutep = var_GetBool (obj, "mute");
}
/** Commit a volume change transaction. */
{
int ret = 0;
- config_PutInt (obj, "volume", volume);
- if (mute)
- volume = AOUT_VOLUME_MIN;
- var_SetBool (obj, "volume-muted", mute);
+ var_SetInteger (obj, "volume", volume);
+ var_SetBool (obj, "mute", mute);
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);
+ ret = aout->output.pf_volume_set (aout, volume, mute);
aout_unlock_input_fifos (aout);
aout_unlock_mixer (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;
}
/**
* Gets the volume of the output device (independent of mute).
*/
-int aout_VolumeGet (vlc_object_t *obj, audio_volume_t *volp)
+audio_volume_t aout_VolumeGet (vlc_object_t *obj)
{
#if 0
aout_instance_t *aout;
- int ret;
audio_volume_t volume;
- bool mute;
- prepareVolume (obj, &aout, &volume, &mute);
+ prepareVolume (obj, &aout, &volume, NULL);
cancelVolume (obj, aout);
- mute = !mute;
- ret = commitVolume (obj, aout, volume, mute);
- if (volp != NULL)
- *volp = mute ? AOUT_VOLUME_MIN : volume;
- return ret;
-#else
- *volp = config_GetInt (obj, "volume");
return 0;
+#else
+ return var_GetInteger (obj, "volume");
#endif
}
#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;
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;
cancelVolume (obj, aout);
return mute;
#else
- return var_GetBool (obj, "volume-muted");
+ return var_GetBool (obj, "mute");
#endif
}
return ret;
}
+
/*
* The next functions are not supposed to be called by the interface, but
* are placeholders for software-only scaling.
*/
-
-/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeSoftInit( aout_instance_t * p_aout )
-{
- int i_volume;
-
- 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 < AOUT_VOLUME_MIN )
- {
- i_volume = AOUT_VOLUME_DEFAULT;
- }
- else if ( i_volume > AOUT_VOLUME_MAX )
- {
- i_volume = AOUT_VOLUME_MAX;
- }
-
- aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
-}
-
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+static int aout_VolumeSoftSet (aout_instance_t *aout, audio_volume_t volume,
+ bool mute)
{
- *pi_volume = p_aout->output.i_volume;
+ float f = mute ? 0. : (volume / (float)AOUT_VOLUME_DEFAULT);
+ aout->mixer_multiplier = f;
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_VolumeSoftInit (aout_instance_t *aout)
{
- aout_MixerMultiplierSet( p_aout, (float)i_volume / AOUT_VOLUME_DEFAULT );
- p_aout->output.i_volume = i_volume;
- return 0;
+ 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.
*/
-
-/* Meant to be called by the output plug-in's Open(). */
-void aout_VolumeNoneInit( aout_instance_t * p_aout )
-{
- p_aout->output.pf_volume_get = aout_VolumeNoneGet;
- p_aout->output.pf_volume_set = aout_VolumeNoneSet;
-}
-
-/* Placeholder for pf_volume_get(). */
-int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+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;
}
- 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 );
- }
+ 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 );
/* 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 );
projects / vlc / blobdiff