[vlc-commits] skins2: do not assume AOUT_VOLUME_MAX = 4 * AOUT_VOLUME_DEFAULT

Rémi Denis-Courmont git at videolan.org
Tue Jul 26 18:35:47 CEST 2011


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

skins2: do not assume AOUT_VOLUME_MAX = 4 * AOUT_VOLUME_DEFAULT

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

 modules/gui/skins2/vars/volume.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp
index cea7cd2..6882c14 100644
--- a/modules/gui/skins2/vars/volume.cpp
+++ b/modules/gui/skins2/vars/volume.cpp
@@ -36,13 +36,13 @@ Volume::Volume( intf_thread_t *pIntf ): VarPercent( pIntf )
     m_step = (float)config_GetInt( pIntf, "volume-step" ) / AOUT_VOLUME_MAX;
     if( var_InheritBool( pIntf, "qt-volume-complete" ) )
     {
-        m_max = 400;
+        m_max = AOUT_VOLUME_MAX * 100 / AOUT_VOLUME_DEFAULT;
         m_volumeMax = AOUT_VOLUME_MAX;
     }
     else
     {
         m_max = 200;
-        m_volumeMax = AOUT_VOLUME_MAX / 2;
+        m_volumeMax = AOUT_VOLUME_DEFAULT * 2;
     }
 
     // Initial value



More information about the vlc-commits mailing list