Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_keys.h

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 795c42f6004b7a26773d6ad63df9fbb4f22532e9..b647b56c61e8568a881cf3397cdeb12b035760a5 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -37,12 +37,15 @@
 #define KEY_MODIFIER_COMMAND 0x10000000
 
 #define KEY_UNSET            0x00000000
+#define KEY_BACKSPACE              0x08
+#define KEY_TAB                    0x09
+#define KEY_ENTER                  0x0D
+#define KEY_ESC                    0x1B
 /* End of Unicode range:     0x0010FFFF */
 #define KEY_LEFT             0x00210000
 #define KEY_RIGHT            0x00220000
 #define KEY_UP               0x00230000
 #define KEY_DOWN             0x00240000
-#define KEY_ENTER            0x00260000
 #define KEY_F1               0x00270000
 #define KEY_F2               0x00280000
 #define KEY_F3               0x00290000
@@ -60,11 +63,8 @@
 #define KEY_INSERT           0x00350000
 #define KEY_DELETE           0x00360000
 #define KEY_MENU             0x00370000
-#define KEY_ESC              0x00380000
 #define KEY_PAGEUP           0x00390000
 #define KEY_PAGEDOWN         0x003A0000
-#define KEY_TAB              0x003B0000
-#define KEY_BACKSPACE        0x003C0000
 
 #define KEY_BROWSER_BACK     0x003F0000
 #define KEY_BROWSER_FORWARD  0x00400000
@@ -90,7 +90,8 @@ VLC_EXPORT( char *, KeyToString, (uint_fast32_t i_key) ) LIBVLC_USED;
 VLC_EXPORT( uint_fast32_t, StringToKey,  (char *psz_key) ) LIBVLC_USED;
 
 typedef enum vlc_key {
-    ACTIONID_QUIT = 1,
+    ACTIONID_NONE = 0,
+    ACTIONID_QUIT,
     ACTIONID_PLAY_PAUSE,
     ACTIONID_PLAY,
     ACTIONID_PAUSE,
@@ -142,6 +143,8 @@ typedef enum vlc_key {
     /* end of contiguous zone */
     ACTIONID_SUBDELAY_UP,
     ACTIONID_SUBDELAY_DOWN,
+    ACTIONID_SUBPOS_UP,
+    ACTIONID_SUBPOS_DOWN,
     ACTIONID_HISTORY_BACK,
     ACTIONID_HISTORY_FORWARD,
     ACTIONID_AUDIO_TRACK,
@@ -203,4 +206,14 @@ typedef enum vlc_key {
     ACTIONID_RATE_FASTER_FINE,
 
 } vlc_key_t;
+
+VLC_EXPORT( vlc_key_t, vlc_GetActionId, (const char *psz_key) ) LIBVLC_USED;
+
+struct hotkey
+{
+    const char *psz_action;
+    vlc_key_t i_action;
+    uint_fast32_t i_key;
+};
+
 #endif