summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-22 07:58:38 +0200
committerwm4 <wm4@nowhere>2014-10-22 07:58:38 +0200
commit0e4658c99c6e9e0767c5a4234de78605e698bf26 (patch)
tree9cc05453169b8804e058ed75c885e774c06c7de0
parent65ba6f9f57a7eff58383cc7b7aa790aa8381e60b (diff)
downloadmpv-0e4658c99c6e9e0767c5a4234de78605e698bf26.tar.bz2
mpv-0e4658c99c6e9e0767c5a4234de78605e698bf26.tar.xz
command: make trailing sub_add actually optional
This was always intended. Also fixes subtitle-file drag & drop.
-rw-r--r--input/cmd_list.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/input/cmd_list.c b/input/cmd_list.c
index 885fc01dc4..6f9bd17af9 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -51,6 +51,7 @@
#define OARG_DOUBLE(def) OPT_DOUBLE(ARG(d), 0, OPTDEF_DOUBLE(def))
#define OARG_INT(def) OPT_INT(ARG(i), 0, OPTDEF_INT(def))
#define OARG_CHOICE(def, c) OPT_CHOICE(ARG(i), 0, c, OPTDEF_INT(def))
+#define OARG_STRING(def) OPT_STRING(ARG(s), 0, OPTDEF_STR(def))
#define OARG_CYCLEDIR(def) OPT_CYCLEDIR(ARG(d), 0, OPTDEF_DOUBLE(def))
@@ -91,7 +92,7 @@ const struct mp_cmd_def mp_cmds[] = {
{ MP_CMD_SHOW_PROGRESS, "show_progress", .allow_auto_repeat = true},
{ MP_CMD_SUB_ADD, "sub_add", { ARG_STRING,
OARG_CHOICE(0, ({"select", 0}, {"auto", 1})),
- ARG_STRING, ARG_STRING } },
+ OARG_STRING(""), OARG_STRING("") } },
{ MP_CMD_SUB_REMOVE, "sub_remove", { OARG_INT(-1) } },
{ MP_CMD_SUB_RELOAD, "sub_reload", { OARG_INT(-1) } },