diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /input/input.c | |
parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'input/input.c')
-rw-r--r-- | input/input.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/input/input.c b/input/input.c index 940076aab6..89cebfa281 100644 --- a/input/input.c +++ b/input/input.c @@ -182,7 +182,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 @@ -358,14 +358,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" }, |