summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/command.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/player/command.c b/player/command.c
index 2a40132a70..5f39817d46 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2973,7 +2973,15 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (!append)
playlist_clear(mpctx->playlist);
- playlist_add(mpctx->playlist, playlist_entry_new(filename));
+ struct playlist_entry *entry = playlist_entry_new(filename);
+ if (cmd->args[2].v.str_list) {
+ char **pairs = cmd->args[2].v.str_list;
+ for (int i = 0; pairs[i] && pairs[i + 1]; i += 2) {
+ playlist_entry_add_param(entry, bstr0(pairs[i]),
+ bstr0(pairs[i + 1]));
+ }
+ }
+ playlist_add(mpctx->playlist, entry);
if (!append)
mp_set_playlist_entry(mpctx, mpctx->playlist->first);