[vlc-commits] hotkeys: print volume also in fullscreen and fix reference value

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jul 26 18:16:19 2011 +0300| [870ca60afb691cbc99f196daa80c46886be8b7fb] | committer: Rémi Denis-Courmont

hotkeys: print volume also in fullscreen and fix reference value

(Do not assume that AOUT_VOLUME_MAX is 4 times AOUT_VOLUME_DEFAULT.)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=870ca60afb691cbc99f196daa80c46886be8b7fb
---

 modules/control/hotkeys.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index d199497..b7d1725 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -1035,11 +1035,8 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
         vout_OSDSlider( p_vout, VOLUME_WIDGET_CHAN,
             i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );
     }
-    else
-    {
-        DisplayMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
-                        i_vol*400/AOUT_VOLUME_MAX );
-    }
+    DisplayMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
+                    i_vol*100/AOUT_VOLUME_DEFAULT );
 }
 
 static void DisplayRate( vout_thread_t *p_vout, float f_rate )