* Change volume range to 0-400 % visually in the macosx and web interfaces. At least...

diff --git a/extras/MacOSX/Resources/vlc.scriptTerminology b/extras/MacOSX/Resources/vlc.scriptTerminology
index 489d327530daf0cce88636c00ae42fa5e44638c7..498fecc43bbd10544f33b0032201de494c448a7a 100644 (file)
--- a/extras/MacOSX/Resources/vlc.scriptTerminology
+++ b/extras/MacOSX/Resources/vlc.scriptTerminology
@@ -69,14 +69,14 @@
             <key>Name</key>
             <string>volumeUp</string>
             <key>Description</key>
-            <string>Bring the volume up by one step. There are 32 steps from 0 to 100% volume.</string>
+            <string>Bring the volume up by one step. There are 32 steps from 0 to 400% volume.</string>
         </dict>
         <key>volumeDown</key>
         <dict>
             <key>Name</key>
             <string>volumeDown</string>
             <key>Description</key>
-            <string>Bring the volume down by one step. There are 32 steps from 0 to 100% volume.</string>
+            <string>Bring the volume down by one step. There are 32 steps from 0 to 400% volume.</string>
         </dict>
     </dict>
 </dict>

diff --git a/modules/control/http.c b/modules/control/http.c
index 7e119a56ae1ff0e61f33c14f7200946dcb499df4..a9f28d841c377c023118f3701a52f648b38103f6 100644 (file)
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -1896,8 +1896,8 @@ static void MacroDo( httpd_file_sys_t *p_args,
                     if( strstr(vol, "%") != NULL )
                     {
                         i_value = atoi( vol );
-                        if( (i_value <= 100) && (i_value>=0) ){
-                            aout_VolumeSet( p_intf, (i_value * (AOUT_VOLUME_MAX - AOUT_VOLUME_MIN))/100+AOUT_VOLUME_MIN);
+                        if( (i_value <= 400) && (i_value>=0) ){
+                            aout_VolumeSet( p_intf, (i_value * (AOUT_VOLUME_MAX - AOUT_VOLUME_MIN))/400+AOUT_VOLUME_MIN);
                             msg_Dbg( p_intf, "requested volume set: %i%%", atoi( vol ));
                         }
                     } else

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index a9fc616f8001fda426953e60f42b81de8accd95c..9d0e8ae2c1d82d05ec1a8f430dc485704b73ea28 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -991,7 +991,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         if( p_intf->p_sys->b_volume_update )
         {
             NSString *o_text;
-            o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_lastShownVolume * 200 / AOUT_VOLUME_MAX];
+            o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
             if( i_lastShownVolume != -1 )
             [self setScrollField:o_text stopAfter:1000000];
 

diff --git a/share/http/index.html b/share/http/index.html
index c1a130e4fe3585394379694f254ae757fb667db9..9594e965175db288e9bfb0ea67c057423143988a 100644 (file)
--- a/share/http/index.html
+++ b/share/http/index.html
@@ -241,7 +241,7 @@ function changeMe(item)
       if ( seconds < 10 ) seconds = "0" + seconds;
       document.getElementById('length').innerHTML = hours+":"+minutes+":"+seconds;
       got_volume = <vlc id="value" param1="volume" />;
-      document.getElementById( 'volume').innerHTML = Math.ceil(got_volume * 100/1024) + " %";
+      document.getElementById( 'volume').innerHTML = Math.ceil(got_volume * 400/1024) + " %";
     </script>
 </body>
 </html>