[vlc-commits] hotkeys: use "zoom" rather than "scale" (like the GUI do)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 23 20:03:32 2014 +0300| [8a20203939d5dcdc8e36bee0484fb67f76c5002f] | committer: Rémi Denis-Courmont

hotkeys: use "zoom" rather than "scale" (like the GUI do)

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

 modules/control/hotkeys.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index d1a898f..e530fac 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -895,10 +895,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
          case ACTIONID_TOGGLE_AUTOSCALE:
             if( p_vout )
             {
-                float f_scalefactor = var_GetFloat( p_vout, "scale" );
+                float f_scalefactor = var_GetFloat( p_vout, "zoom" );
                 if ( f_scalefactor != 1.f )
                 {
-                    var_SetFloat( p_vout, "scale", 1.f );
+                    var_SetFloat( p_vout, "zoom", 1.f );
                     DisplayMessage( p_vout, _("Zooming reset") );
                 }
                 else
@@ -915,21 +915,21 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_SCALE_UP:
             if( p_vout )
             {
-               float f_scalefactor = var_GetFloat( p_vout, "scale" );
+               float f_scalefactor = var_GetFloat( p_vout, "zoom" );
 
                if( f_scalefactor < 10.f )
                    f_scalefactor += .1f;
-               var_SetFloat( p_vout, "scale", f_scalefactor );
+               var_SetFloat( p_vout, "zoom", f_scalefactor );
             }
             break;
         case ACTIONID_SCALE_DOWN:
             if( p_vout )
             {
-               float f_scalefactor = var_GetFloat( p_vout, "scale" );
+               float f_scalefactor = var_GetFloat( p_vout, "zoom" );
 
                if( f_scalefactor > .3f )
                    f_scalefactor -= .1f;
-               var_SetFloat( p_vout, "scale", f_scalefactor );
+               var_SetFloat( p_vout, "zoom", f_scalefactor );
             }
             break;