hotkeys: print volume also in fullscreen and fix reference value
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 26 Jul 2011 15:16:19 +0000 (18:16 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 26 Jul 2011 15:16:19 +0000 (18:16 +0300)
(Do not assume that AOUT_VOLUME_MAX is 4 times AOUT_VOLUME_DEFAULT.)

modules/control/hotkeys.c

index d199497..b7d1725 100644 (file)
@@ -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 )