summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-16 16:36:32 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-16 16:36:32 +0000
commit82d7a7a8f3e9d7ed1a4b3151a60887e963c979d5 (patch)
tree96dcfdb96a08302da13a5b0848f442c53c41d8df /input
parent24c5ce1c3bdfd0a113b3548b82f28d9ecfae33c9 (diff)
downloadmpv-82d7a7a8f3e9d7ed1a4b3151a60887e963c979d5.tar.bz2
mpv-82d7a7a8f3e9d7ed1a4b3151a60887e963c979d5.tar.xz
Now enter key quit if no next file is avaible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5136 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/input/input.c b/input/input.c
index 94f9d1fc77..6391dd1de5 100644
--- a/input/input.c
+++ b/input/input.c
@@ -37,8 +37,8 @@ static mp_cmd_t mp_cmds[] = {
{ MP_CMD_QUIT, "quit", 0, { {-1,{0}} } },
{ MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
{ MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} } },
- { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
- { MP_CMD_PLAY_TREE_UP_STEP, "pt_up_step",1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } },
+ { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
+ { MP_CMD_PLAY_TREE_UP_STEP, "pt_up_step",1, { { MP_CMD_ARG_INT,{0} }, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
{ MP_CMD_PLAY_ALT_SRC_STEP, "alt_src_step",1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } },
{ MP_CMD_SUB_DELAY, "sub_delay",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
@@ -157,12 +157,16 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { 'q', 0 }, "quit" },
{ { KEY_ESC, 0 }, "quit" },
{ { KEY_ENTER, 0 }, "quit" },
-// { { 'p', 0 }, "pause" },
+#ifndef HAVE_NEW_GUI
+ { { 'p', 0 }, "pause" },
+#endif
{ { ' ', 0 }, "pause" },
{ { KEY_HOME, 0 }, "pt_up_step 1" },
{ { KEY_END, 0 }, "pt_up_step -1" },
{ { '>', 0 }, "pt_step 1" },
-// { { KEY_ENTER, 0 }, "pt_step 1" },
+#ifndef HAVE_NEW_GUI
+ { { KEY_ENTER, 0 }, "pt_step 1 1" },
+#endif
{ { '<', 0 }, "pt_step -1" },
{ { KEY_INS, 0 }, "alt_src_step 1" },
{ { KEY_DEL, 0 }, "alt_src_step -1" },