[vlc-devel] commit: Removed duplicated code in audio intf.c (Laurent Aimar )
git version control
git at videolan.org
Wed Aug 12 19:26:37 CEST 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Aug 9 16:33:46 2009 +0200| [f5236c7b95a3966f2f80fe3d4980a90b81d72dfa] | committer: Laurent Aimar
Removed duplicated code in audio intf.c
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5236c7b95a3966f2f80fe3d4980a90b81d72dfa
---
src/audio_output/intf.c | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index e373298..ed0c78b 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -167,30 +167,10 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
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 );
}
/*****************************************************************************
More information about the vlc-devel
mailing list