[vlc-commits] commit: Zoom hotkeys: fix conflicts with Qt interface (Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Mon May 17 16:30:45 CEST 2010


vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 17 16:28:37 2010 +0200| [4f389d4baf7ad81af68a392fb9d3eaff70978a1f] | committer: Jean-Baptiste Kempf 

Zoom hotkeys: fix conflicts with Qt interface

Close #3622
(cherry picked from commit 9a2fcda2f1124e6bc0b4d7ef143ca5f464c33d18)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4f389d4baf7ad81af68a392fb9d3eaff70978a1f
---

 src/libvlc-module.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index d4077fe..bfcc201 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2432,10 +2432,10 @@ vlc_module_begin ()
 #   define KEY_UNCROP_RIGHT       KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'f'
 
 /* Zooming */
-#   define KEY_ZOOM_QUARTER       KEY_MODIFIER_CTRL|'1'
-#   define KEY_ZOOM_HALF          KEY_MODIFIER_CTRL|'2'
-#   define KEY_ZOOM_ORIGINAL      KEY_MODIFIER_CTRL|'3'
-#   define KEY_ZOOM_DOUBLE        KEY_MODIFIER_CTRL|'4'
+#   define KEY_ZOOM_QUARTER       KEY_MODIFIER_ALT|'1'
+#   define KEY_ZOOM_HALF          KEY_MODIFIER_ALT|'2'
+#   define KEY_ZOOM_ORIGINAL      KEY_MODIFIER_ALT|'3'
+#   define KEY_ZOOM_DOUBLE        KEY_MODIFIER_ALT|'4'
 
 /* Bookmarks */
 #   define KEY_SET_BOOKMARK1      KEY_MODIFIER_CTRL|KEY_F1



More information about the vlc-commits mailing list