Don't change enum orders.

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index f178831cbc18fe1f688d4af52163aa7573d8a0ce..0776acc9c8062a1e44726a18a9bcfd2820e60eee 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -309,7 +309,6 @@ typedef enum vlc_key {
     ACTIONID_DISC_MENU,
     ACTIONID_ASPECT_RATIO,
     ACTIONID_CROP,
-    ACTIONID_TOGGLE_SCALING,
     ACTIONID_DEINTERLACE,
     ACTIONID_ZOOM,
     ACTIONID_UNZOOM,
@@ -340,5 +339,7 @@ typedef enum vlc_key {
     ACTIONID_ZOOM_DOUBLE,
     /* Cycle Through Audio Devices */
     ACTIONID_AUDIODEVICE_CYCLE
+    /* Scaling in fullscreen */
+    ACTIONID_TOGGLE_SCALING,
 } vlc_key_t;
 #endif

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index e88aab89f2a6ec033be1c88d39361acb2d28e9c6..0f910c295dce97473292ceb5d82e2763ff7820f0 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2681,7 +2681,6 @@ const struct hotkey libvlc_hotkeys[] =
     { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0, },
     { "key-aspect-ratio", ACTIONID_ASPECT_RATIO, 0, },
     { "key-crop", ACTIONID_CROP, 0, },
-    { "key-toggle-scaling", ACTIONID_TOGGLE_SCALING, 0, },
     { "key-deinterlace", ACTIONID_DEINTERLACE, 0, },
     { "key-intf-show", ACTIONID_INTF_SHOW, 0, },
     { "key-intf-hide", ACTIONID_INTF_HIDE, 0, },
@@ -2745,6 +2744,7 @@ const struct hotkey libvlc_hotkeys[] =
     { "key-menu-down", ACTIONID_MENU_DOWN, 0, },
     { "key-menu-select", ACTIONID_MENU_SELECT, 0, },
     { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, 0, },
+    { "key-toggle-scaling", ACTIONID_TOGGLE_SCALING, 0, },
     { NULL, 0, 0, }
 };