RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-21 23:23:19 +00:00
Code Issues Releases Wiki Activity

player: give quit_watch_later an exit code argument like quit

Browse Source 
The quit command has an optional argument that is used as exit code.
Extend that to the quit_watch_later command. Actually, unify the
implementations of the two commands.

Requested in #798.
This commit is contained in:
wm4 2014-05-22 21:28:20 +02:00
parent aca4f9f474
commit cb2e784c07
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DOCS/man/en/input.rst
View File

@ -242,11 +242,12 @@ List of Input Commands
shell script, and call that with ``run``.
``quit [<code>]``
Exit the player using the given exit code.
Exit the player. If an argument is given, it's used as process exit code.
``quit_watch_later``
``quit_watch_later [<code>]``
Exit player, and store current playback position. Playing that file later
will seek to the previous position on start.
will seek to the previous position on start. The (optional) argument is
exactly as in the ``quit`` command.
``sub_add "<file>"``
Load the given subtitle file. It is not selected as current subtitle after

2
input/cmd_list.c
View File

@ -70,7 +70,7 @@ const struct mp_cmd_def mp_cmds[] = {
},
{ MP_CMD_REVERT_SEEK, "revert_seek", },
{ MP_CMD_QUIT, "quit", { OARG_INT(0) } },
{ MP_CMD_QUIT_WATCH_LATER, "quit_watch_later", },
{ MP_CMD_QUIT_WATCH_LATER, "quit_watch_later", { OARG_INT(0) } },
{ MP_CMD_STOP, "stop", },
{ MP_CMD_FRAME_STEP, "frame_step", .allow_auto_repeat = true },
{ MP_CMD_FRAME_BACK_STEP, "frame_back_step", .allow_auto_repeat = true },

9
player/command.c
View File

@ -3242,17 +3242,14 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
break;
case MP_CMD_QUIT:
case MP_CMD_QUIT_WATCH_LATER:
if (cmd->id == MP_CMD_QUIT_WATCH_LATER)
mp_write_watch_later_conf(mpctx);
mpctx->stop_play = PT_QUIT;
mpctx->quit_custom_rc = cmd->args[0].v.i;
mpctx->has_quit_custom_rc = true;
break;
case MP_CMD_QUIT_WATCH_LATER:
mp_write_watch_later_conf(mpctx);
mpctx->stop_play = PT_QUIT;
mpctx->quit_player_rc = 0;
break;
case MP_CMD_PLAYLIST_NEXT:
case MP_CMD_PLAYLIST_PREV:
{