Skins: set the maximum volume to 1024, not 512

close #2089

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 926f049c2c1fe703c1a01bc2a4fbb6c8897a779c..0ebde91a93cb5fea7ffa64d5d03ff280adea13f2 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -682,7 +682,7 @@ void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
     audio_volume_t volume;
     aout_VolumeGet( pPlaylist, &volume );
-    SET_VOLUME( m_cVarVolume, (double)volume * 2.0 / AOUT_VOLUME_MAX, false );
+    SET_VOLUME( m_cVarVolume, (double)volume / AOUT_VOLUME_MAX, false );
     SET_BOOL( m_cVarMute, volume == 0 );
 }
 
@@ -775,7 +775,7 @@ void VlcProc::init_variables()
 
     audio_volume_t volume;
     aout_VolumeGet( pPlaylist, &volume );
-    SET_VOLUME( m_cVarVolume, (double)volume * 2.0 / AOUT_VOLUME_MAX, false );
+    SET_VOLUME( m_cVarVolume, (double)volume / AOUT_VOLUME_MAX, false );
     SET_BOOL( m_cVarMute, volume == 0 );
 
     update_equalizer();

diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp
index 075057df17bf93faabfc7e9824af23e4b5d90dec..2809c0d58349e578de2d7a27c5e99aa68047ebf3 100644 (file)
--- a/modules/gui/skins2/vars/volume.cpp
+++ b/modules/gui/skins2/vars/volume.cpp
@@ -37,7 +37,7 @@ Volume::Volume( intf_thread_t *pIntf ): VarPercent( pIntf )
     audio_volume_t val;
 
     aout_VolumeGet( getIntf()->p_sys->p_playlist, &val );
-    VarPercent::set( val * 2.0 / AOUT_VOLUME_MAX );
+    VarPercent::set( val / AOUT_VOLUME_MAX );
 }
 
 
@@ -48,10 +48,9 @@ void Volume::set( float percentage, bool updateVLC )
         (int)(percentage * AOUT_VOLUME_MAX) )
     {
         VarPercent::set( percentage );
-
         if( updateVLC )
             aout_VolumeSet( getIntf()->p_sys->p_playlist,
-                            (int)(get() * AOUT_VOLUME_MAX / 2.0) );
+                            (int)(get() * AOUT_VOLUME_MAX) );
     }
 }