}
aout_lock_mixer( p_aout );
- if ( !p_aout->mixer.b_error )
+ if ( p_aout->p_mixer )
{
i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
}
*****************************************************************************/
int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
{
- aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE );
- int i_result = 0;
-
config_PutInt( p_object, "volume", i_volume );
var_SetBool( p_object->p_libvlc, "volume-change", true );
- if ( p_aout == NULL ) return 0;
-
- 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;
-}
+ var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume );
-/*****************************************************************************
- * aout_VolumeInfos : get the boundary pi_soft
- *****************************************************************************/
-int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
-{
- aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- int i_result;
+ aout_instance_t *p_aout = vlc_object_find( p_object,
+ VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if ( p_aout == NULL )
+ return VLC_SUCCESS;
- if ( p_aout == NULL ) return 0;
+ int i_result = VLC_SUCCESS;
aout_lock_mixer( p_aout );
- if ( p_aout->mixer.b_error )
- {
- /* The output module is destroyed. */
- i_result = -1;
- }
- else
- {
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
- }
+ aout_lock_input_fifos( p_aout );
+ if ( p_aout->p_mixer )
+ i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
+ aout_unlock_input_fifos( p_aout );
aout_unlock_mixer( p_aout );
+ var_SetBool( p_aout, "intf-change", true );
vlc_object_release( p_aout );
return i_result;
}
i_volume = AOUT_VOLUME_MAX;
else if ( i_volume < AOUT_VOLUME_MIN )
i_volume = AOUT_VOLUME_MIN;
-
- config_PutInt( p_object, "volume", i_volume );
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume" , i_volume );
if ( pi_volume != NULL )
*pi_volume = i_volume;
- var_SetBool( p_object->p_libvlc, "volume-change", true );
-
- aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if ( p_aout == NULL )
- return 0;
-
- int i_result;
- aout_lock_mixer( p_aout );
- if ( !p_aout->mixer.b_error )
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
- else
- i_result = VLC_SUCCESS;
- aout_unlock_mixer( p_aout );
-
- vlc_object_release( p_aout );
- return i_result;
+ return __aout_VolumeSet( p_object, i_volume );
}
/*****************************************************************************
{
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;
aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
}
-/* Placeholder for pf_volume_infos(). */
-int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
-{
- (void)p_aout;
- *pi_soft = 0;
- return 0;
-}
-
/* Placeholder for pf_volume_get(). */
int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{
/* 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 )
-{
- (void)p_aout; (void)pi_soft;
- return -1;
-}
-
/* Placeholder for pf_volume_get(). */
int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{