X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_keys.h;h=ca394fda571e73410e2ada001ef3b82f11ff71d9;hb=80861b6ec3c3760b4400d0b8cb80dbe14fc75923;hp=677169390e555d0a8c60e389d4916050d5524928;hpb=10289bdecce4a6a889ca9ead47dbb13a0b8a13fb;p=vlc

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 677169390e..ca394fda57 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -86,10 +86,10 @@
 #define KEY_MOUSEWHEELLEFT   0x00F20000
 #define KEY_MOUSEWHEELRIGHT  0x00F30000
 
-VLC_EXPORT( char *, KeyToString, (uint_fast32_t i_key) ) LIBVLC_USED;
-VLC_EXPORT( uint_fast32_t, StringToKey,  (char *psz_key) ) LIBVLC_USED;
+VLC_API char *vlc_keycode2str(uint_fast32_t i_key) VLC_USED;
+VLC_API uint_fast32_t vlc_str2keycode(const char *str) VLC_USED;
 
-typedef enum vlc_key {
+typedef enum vlc_action {
     ACTIONID_NONE = 0,
     ACTIONID_QUIT,
     ACTIONID_PLAY_PAUSE,
@@ -173,7 +173,6 @@ typedef enum vlc_key {
     ACTIONID_UNCROP_BOTTOM,
     ACTIONID_CROP_RIGHT,
     ACTIONID_UNCROP_RIGHT,
-    ACTIONID_DUMP,
     ACTIONID_RANDOM,
     ACTIONID_LOOP,
     ACTIONID_WALLPAPER,
@@ -201,15 +200,13 @@ typedef enum vlc_key {
     ACTIONID_RATE_SLOWER_FINE,
     ACTIONID_RATE_FASTER_FINE,
 
-} vlc_key_t;
+} vlc_action_t;
 
-VLC_EXPORT( vlc_key_t, vlc_GetActionId, (const char *psz_key) ) LIBVLC_USED;
+VLC_API vlc_action_t vlc_GetActionId(const char *psz_key) VLC_USED;
 
 struct hotkey
 {
     const char *psz_action;
-    vlc_key_t i_action;
-    uint_fast32_t i_key;
 };
 
 #endif