summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorxylosper <darklin20@gmail.com>2014-02-22 15:28:05 +0900
committerwm4 <wm4@nowhere>2014-02-23 17:49:34 +0100
commitbb6b543812a72484fe657f04ae5c050d353b7584 (patch)
treebf3726cb7985a32e7eae40edc6f08760cc08daf9 /input
parentf5c781b0d5755cb503a0531a159cd3664b32c620 (diff)
downloadmpv-bb6b543812a72484fe657f04ae5c050d353b7584.tar.bz2
mpv-bb6b543812a72484fe657f04ae5c050d353b7584.tar.xz
command: provide per-file-options for loadfile command
Signed-off-by: wm4 <wm4@nowhere> Closes #575. Minor changes over original pull request.
Diffstat (limited to 'input')
-rw-r--r--input/cmd_list.c1
-rw-r--r--input/input.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/input/cmd_list.c b/input/cmd_list.c
index c5bfbc34aa..982d4f366c 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -122,6 +122,7 @@ const struct mp_cmd_def mp_cmds[] = {
ARG_STRING,
OARG_CHOICE(0, ({"replace", 0}, {"0", 0},
{"append", 1}, {"1", 1})),
+ OPT_KEYVALUELIST(ARG(str_list), 0),
}},
{ MP_CMD_LOADLIST, "loadlist", {
ARG_STRING,
diff --git a/input/input.h b/input/input.h
index ee66ff6f8a..6e2e0f7046 100644
--- a/input/input.h
+++ b/input/input.h
@@ -75,6 +75,7 @@ struct mp_cmd_arg {
float f;
double d;
char *s;
+ char **str_list;
void *p;
} v;
};