Reworked OSD Volume handling and display of volumebar. Run make stamp-api to update...

[vlc] / modules / control / rc.c

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 4a7db821c79efc87b1e0878ccb244e351ff5356b..57a7e88474d995b24685b9b699005efc354f3e62 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1686,7 +1686,8 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
                 var_Set( p_intf->p_vlc, "key-pressed", keyval );
             }        
             i_error = aout_VolumeSet( p_this, i_volume );
-            msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
+            osd_Volume( p_this );
+            msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );            
         }
     }
     else
@@ -1724,14 +1725,13 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
     {
         if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 )
             i_error = VLC_EGENERIC;
-        osd_VolumeUp( p_this );
     }
     else
     {
         if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 )
             i_error = VLC_EGENERIC;
-        osd_VolumeDown( p_this );
     }
+    osd_Volume( p_this );
 
     if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
     return i_error;