summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-04 17:20:58 +0100
committerwm4 <wm4@nowhere>2015-03-04 17:28:42 +0100
commit9e1866af1ecb8faf2b3e913eaca60c4a36911108 (patch)
tree8963f18374c486d556794f6997880b6e74316ec3 /input
parentf447179c598fcd13cd239a56044b483c660f6093 (diff)
downloadmpv-9e1866af1ecb8faf2b3e913eaca60c4a36911108.tar.bz2
mpv-9e1866af1ecb8faf2b3e913eaca60c4a36911108.tar.xz
input: remove numeric compatibility parameters from commands
MPlayer requires numeric values for input command parameters. mplayer2 also did. mpv changed these to choices using symbolic strings a long time ago, but left numeric choices for compatibility.
Diffstat (limited to 'input')
-rw-r--r--input/cmd_list.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/input/cmd_list.c b/input/cmd_list.c
index 380e241b60..9eda21b5c9 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -60,12 +60,12 @@ const struct mp_cmd_def mp_cmds[] = {
{ MP_CMD_SEEK, "seek", {
ARG_TIME,
- OARG_CHOICE(0, ({"relative", 0}, {"0", 0}, {"-", 0},
- {"absolute-percent", 1}, {"1", 1},
- {"absolute", 2}, {"2", 2})),
- OARG_CHOICE(0, ({"default-precise", 0}, {"0", 0},
- {"exact", 1}, {"1", 1},
- {"keyframes", -1}, {"-1", -1})),
+ OARG_CHOICE(0, ({"relative", 0},, {"-", 0},
+ {"absolute-percent", 1},
+ {"absolute", 2},
+ OARG_CHOICE(0, ({"default-precise", 0},
+ {"exact", 1},
+ {"keyframes", -1})),
},
.allow_auto_repeat = true,
},
@@ -79,12 +79,12 @@ const struct mp_cmd_def mp_cmds[] = {
.on_updown = true },
{ MP_CMD_FRAME_BACK_STEP, "frame_back_step", .allow_auto_repeat = true },
{ MP_CMD_PLAYLIST_NEXT, "playlist_next", {
- OARG_CHOICE(0, ({"weak", 0}, {"0", 0},
- {"force", 1}, {"1", 1})),
+ OARG_CHOICE(0, ({"weak", 0},,
+ {"force", 1})),
}},
{ MP_CMD_PLAYLIST_PREV, "playlist_prev", {
- OARG_CHOICE(0, ({"weak", 0}, {"0", 0},
- {"force", 1}, {"1", 1})),
+ OARG_CHOICE(0, ({"weak", 0},
+ {"force", 1})),
}},
{ MP_CMD_SUB_STEP, "sub_step", { ARG_INT }, .allow_auto_repeat = true },
{ MP_CMD_SUB_SEEK, "sub_seek", { ARG_INT }, .allow_auto_repeat = true },
@@ -116,15 +116,15 @@ const struct mp_cmd_def mp_cmds[] = {
}},
{ MP_CMD_LOADFILE, "loadfile", {
ARG_STRING,
- OARG_CHOICE(0, ({"replace", 0}, {"0", 0},
- {"append", 1}, {"1", 1},
+ OARG_CHOICE(0, ({"replace", 0},
+ {"append", 1},
{"append-play", 2})),
OPT_KEYVALUELIST(ARG(str_list), MP_CMD_OPT_ARG),
}},
{ MP_CMD_LOADLIST, "loadlist", {
ARG_STRING,
- OARG_CHOICE(0, ({"replace", 0}, {"0", 0},
- {"append", 1}, {"1", 1})),
+ OARG_CHOICE(0, ({"replace", 0},
+ {"append", 1})),
}},
{ MP_CMD_PLAYLIST_CLEAR, "playlist_clear", },
{ MP_CMD_PLAYLIST_REMOVE, "playlist_remove", {