summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-23 00:20:53 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-07-24 21:15:55 +0200
commit2d8e26bb72d8b1645f98979f2715e1a12e9d1ab5 (patch)
tree6a731586bf18ea1832b63a5e64b2411c90850eb5 /player/command.c
parent7ee275095f519119bd13c3af8f35f9158741b547 (diff)
downloadmpv-2d8e26bb72d8b1645f98979f2715e1a12e9d1ab5.tar.bz2
mpv-2d8e26bb72d8b1645f98979f2715e1a12e9d1ab5.tar.xz
command: add append-play loadfile mode
"loadfile filename append-play" will now always append the file to the playlist, and if nothing is playing yet, start playback. I don't want to change the semantics of "append" mode, so a new mode is needed. Probably fixes issue #950.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c
index 952d348af9..7282eb30fd 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3550,7 +3550,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
case MP_CMD_LOADFILE: {
char *filename = cmd->args[0].v.s;
- bool append = cmd->args[1].v.i;
+ int append = cmd->args[1].v.i;
if (!append)
playlist_clear(mpctx->playlist);
@@ -3565,7 +3565,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
}
playlist_add(mpctx->playlist, entry);
- if (!append)
+ if (!append || (append == 2 && !mpctx->playlist->current))
mp_set_playlist_entry(mpctx, mpctx->playlist->first);
break;
}