Changeset c3a591ae44437c1f36a981a43b1bc3295a27d6d1

Timestamp:

02/29/08 15:29:40 (4 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1204295380 +0000

git-parent:

[a041f7eedbf62a0bf26576cac30bb1c9a76da0f8]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1204295380 +0000

Message:

Patch by Johannes Buchner (buchner.johannes at gmx do at): Hotkeys for zoom.

Files:

• THANKS (modified) (1 diff)
• include/vlc_keys.h (modified) (2 diffs)
• modules/control/hotkeys.c (modified) (1 diff)
• src/libvlc-module.c (modified) (5 diffs)
• src/libvlc.h (modified) (1 diff)

THANKS

@@ -119 +119 @@
-Joeri van Dooren <joeri at van.dooren.be> - OS X icon (v0.4.0)
-Jörg<vlc-ml at aab.noctis dot de> - VLM seek/show media functions
+Johannes BUchner <buchner.johannes at gmx dot at> - Hotkeys for zoom
-Johen Michael Zorko <zorko at att.net> - fix for delay issues in udp sout
-John Dalgliesh <johnd at defyne.org> - macosx interface playlist fix

include/vlc_keys.h

@@ -141 +141 @@
-    { "Mouse Wheel Up", KEY_MOUSEWHEELUP },
-    { "Mouse Wheel Down", KEY_MOUSEWHEELDOWN },
+    { "0", '0' },
+    { "1", '1' },
+    { "2", '2' },
+    { "3", '3' },
+    { "4", '4' },
+    { "5", '5' },
+    { "6", '6' },
+    { "7", '7' },
+    { "8", '8' },
+    { "9", '9' },
-    { "a", 'a' },
-    { "b", 'b' },
@@ -320 +330 @@
-#define ACTIONID_MENU_DOWN             90
-#define ACTIONID_MENU_SELECT           91
+/* Zoom */
+#define ACTIONID_ZOOM_QUARTER          92
+#define ACTIONID_ZOOM_HALF             93
+#define ACTIONID_ZOOM_ORIGINAL         94
+#define ACTIONID_ZOOM_DOUBLE           95
-
-#endif

modules/control/hotkeys.c

@@ -353 +353 @@
-            var_Set( p_playlist, "random", val );
-        }
+        else if( i_action == ACTIONID_ZOOM_QUARTER || 
+                 i_action == ACTIONID_ZOOM_HALF ||
+                 i_action == ACTIONID_ZOOM_ORIGINAL || 
+                 i_action == ACTIONID_ZOOM_DOUBLE )
+        {
+            if( p_vout )
+            {
+                if( i_action == ACTIONID_ZOOM_QUARTER )
+                    val.f_float = 0.25;
+                if( i_action == ACTIONID_ZOOM_HALF )
+                    val.f_float = 0.5;
+                if( i_action == ACTIONID_ZOOM_ORIGINAL )
+                    val.f_float = 1;
+                if( i_action == ACTIONID_ZOOM_DOUBLE )
+                    val.f_float = 2;
+                var_Set( p_vout, "zoom", val );
+            }
+        }
-        else if( i_action == ACTIONID_PLAY_PAUSE )
-        {

src/libvlc-module.c

@@ -1233 +1233 @@
-#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down")
-#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.")
+
+#define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
+#define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
+#define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
+#define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
+
-#define PLAY_BOOKMARK1_KEY_TEXT N_("Play playlist bookmark 1")
-#define PLAY_BOOKMARK2_KEY_TEXT N_("Play playlist bookmark 2")
@@ -2046 +2052 @@
-#   define KEY_UNCROP_RIGHT       KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
-
+/* the macosx-interface already has bindings */
+#   define KEY_ZOOM_QUARTER       KEY_UNSET 
+#   define KEY_ZOOM_HALF          KEY_UNSET
+#   define KEY_ZOOM_ORIGINAL      KEY_UNSET
+#   define KEY_ZOOM_DOUBLE        KEY_UNSET
+
-#   define KEY_SET_BOOKMARK1      KEY_MODIFIER_COMMAND|KEY_F1
-#   define KEY_SET_BOOKMARK2      KEY_MODIFIER_COMMAND|KEY_F2
@@ -2141 +2153 @@
-#   define KEY_CROP_RIGHT         KEY_MODIFIER_ALT|'l'
-#   define KEY_UNCROP_RIGHT       KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
+
+#   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_SET_BOOKMARK1      KEY_MODIFIER_CTRL|KEY_F1
@@ -2320 +2337 @@
-             LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, VLC_FALSE );
-
+    set_section ( N_("Zoom" ), NULL );
+    add_key( "key-zoom-quarter",  KEY_ZOOM_QUARTER, NULL, 
+        ZOOM_QUARTER_KEY_TEXT,  NULL, VLC_FALSE );
+    add_key( "key-zoom-half",     KEY_ZOOM_HALF, NULL, 
+        ZOOM_HALF_KEY_TEXT,     NULL, VLC_FALSE );
+    add_key( "key-zoom-original", KEY_ZOOM_ORIGINAL, NULL, 
+        ZOOM_ORIGINAL_KEY_TEXT, NULL, VLC_FALSE );
+    add_key( "key-zoom-double",   KEY_ZOOM_DOUBLE, NULL, 
+        ZOOM_DOUBLE_KEY_TEXT,   NULL, VLC_FALSE );
+    
-    set_section ( N_("Jump sizes" ), NULL );
-    add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
@@ -2540 +2567 @@
-    { "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 },
-    { "key-chapter-next", ACTIONID_CHAPTER_NEXT, 0, 0, 0, 0 },
+    { "key-zoom-quarter", ACTIONID_ZOOM_QUARTER, 0, 0, 0, 0 },
+    { "key-zoom-half", ACTIONID_ZOOM_HALF, 0, 0, 0, 0 },
+    { "key-zoom-original", ACTIONID_ZOOM_ORIGINAL, 0, 0, 0, 0 },
+    { "key-zoom-double", ACTIONID_ZOOM_DOUBLE, 0, 0, 0, 0 },
-    { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0, 0, 0, 0 },
-    { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0, 0, 0, 0 },

src/libvlc.h

@@ -138 +138 @@
-};
-
+#define ZOOM_SECTION N_("Zoom")
+#define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
+#define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
+#define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
+#define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
-
-static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )