summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-19 18:51:42 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-19 18:51:42 +0000
commit59346bc23a2910851596a0c36622ba49ef7b3ba3 (patch)
tree1da9aa1a49129ad32aa922a4282f673c0ec4b8d4 /input
parent864dc161406201d88b40bbfedf26772a281a1d83 (diff)
downloadmpv-59346bc23a2910851596a0c36622ba49ef7b3ba3.tar.bz2
mpv-59346bc23a2910851596a0c36622ba49ef7b3ba3.tar.xz
Change DVDNAV command key names.
Parameters now use a string much more intuitive than previous int value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27100 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c18
-rw-r--r--input/input.h19
2 files changed, 19 insertions, 18 deletions
diff --git a/input/input.c b/input/input.c
index 6fab4c1219..df705c2672 100644
--- a/input/input.c
+++ b/input/input.c
@@ -171,7 +171,7 @@ static const mp_cmd_t mp_cmds[] = {
#endif
#ifdef USE_DVDNAV
- { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
+ { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
#endif
#ifdef HAVE_MENU
@@ -347,14 +347,14 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
{ { MOUSE_BTN6, 0 }, "volume -1" },
#ifdef USE_DVDNAV
- { { KEY_KP8, 0 }, "dvdnav 1" }, // up
- { { KEY_KP2, 0 }, "dvdnav 2" }, // down
- { { KEY_KP4, 0 }, "dvdnav 3" }, // left
- { { KEY_KP6, 0 }, "dvdnav 4" }, // right
- { { KEY_KP5, 0 }, "dvdnav 5" }, // menu
- { { KEY_KPENTER, 0 }, "dvdnav 6" }, // select
- { { MOUSE_BTN0, 0 }, "dvdnav 8" }, //select
- { { KEY_KP7, 0 }, "dvdnav 7" }, // previous menu
+ { { KEY_KP8, 0 }, "dvdnav up" }, // up
+ { { KEY_KP2, 0 }, "dvdnav down" }, // down
+ { { KEY_KP4, 0 }, "dvdnav left" }, // left
+ { { KEY_KP6, 0 }, "dvdnav right" }, // right
+ { { KEY_KP5, 0 }, "dvdnav menu" }, // menu
+ { { KEY_KPENTER, 0 }, "dvdnav select" }, // select
+ { { MOUSE_BTN0, 0 }, "dvdnav mouse" }, //select
+ { { KEY_KP7, 0 }, "dvdnav prev" }, // previous menu
#endif
{ { KEY_RIGHT, 0 }, "seek 10" },
diff --git a/input/input.h b/input/input.h
index e7cd0c5f24..8cb1b9730e 100644
--- a/input/input.h
+++ b/input/input.h
@@ -112,6 +112,16 @@ typedef enum {
MP_CMD_SWITCH_TITLE,
MP_CMD_STOP,
+ /// DVDNAV commands
+ MP_CMD_DVDNAV_UP = 1000,
+ MP_CMD_DVDNAV_DOWN,
+ MP_CMD_DVDNAV_LEFT,
+ MP_CMD_DVDNAV_RIGHT,
+ MP_CMD_DVDNAV_MENU,
+ MP_CMD_DVDNAV_SELECT,
+ MP_CMD_DVDNAV_PREVMENU,
+ MP_CMD_DVDNAV_MOUSECLICK,
+
/// GUI commands
MP_CMD_GUI_EVENTS = 5000,
MP_CMD_GUI_LOADFILE,
@@ -133,15 +143,6 @@ typedef enum {
MP_CMD_CHIDE,
} mp_command_type;
-#define MP_CMD_DVDNAV_UP 1
-#define MP_CMD_DVDNAV_DOWN 2
-#define MP_CMD_DVDNAV_LEFT 3
-#define MP_CMD_DVDNAV_RIGHT 4
-#define MP_CMD_DVDNAV_MENU 5
-#define MP_CMD_DVDNAV_SELECT 6
-#define MP_CMD_DVDNAV_PREVMENU 7
-#define MP_CMD_DVDNAV_MOUSECLICK 8
-
// The arg types
#define MP_CMD_ARG_INT 0
#define MP_CMD_ARG_FLOAT 1