* src/audio_output/intf.c: optimise aout_VolumeGet a bit.

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 4d510caa86aa26dd8c7903c3b06b0dee35c68a37..a80df9f4811d8712e928f227aca3d5f650e3ca20 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -61,20 +61,27 @@
  *****************************************************************************/
 int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
 {
-    int i_volume, i_result = 0;
+    int i_result = 0;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
 
-    i_volume = config_GetInt( p_object, "volume" );
-    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i_volume;
+    if ( pi_volume == NULL ) return -1;
 
-    if ( p_aout == NULL ) return 0;
+    if ( p_aout == NULL )
+    {
+        *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+        return 0;
+    }
 
     vlc_mutex_lock( &p_aout->mixer_lock );
     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" );
+    }
     vlc_mutex_unlock( &p_aout->mixer_lock );
 
     vlc_object_release( p_aout );