[vlc-commits] Revert "hotkeys: Reset scale to screen when zooming"

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jun 15 11:25:27 2017 +0200| [942e24065a6c8054251b84d6c3b313d0f8401ff2] | committer: Hugo Beauzée-Luyssen

Revert "hotkeys: Reset scale to screen when zooming"

This reverts commit e287366ad9d6d9b85e913b03be54ac15f4e8873a.
This was an invalid way of fixing #18258
Having the fullscreen state properly propagated to the vout_display
fixes the issue in a more proper way

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

 modules/control/hotkeys.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 363eecda07..4f6611cf09 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -1193,15 +1193,6 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input,
         case ACTIONID_UNZOOM:
             if( p_vout )
             {
-                bool b_autoscale = var_GetBool( p_vout, "autoscale" );
-                if( b_autoscale )
-                {
-                    DisplayMessage( p_vout, _("Original Size") );
-                    var_SetBool( p_vout, "autoscale", false );
-                    var_SetFloat( p_vout, "zoom", 1.f );
-                    break;
-                }
-
                 vlc_value_t val={0}, val_list, text_list;
                 var_Get( p_vout, "zoom", &val );
                 if( var_Change( p_vout, "zoom", VLC_VAR_GETCHOICES,