mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
quit slave mode command now accepts an exit value, patch by Aurelien Jacobs <aurel at gnuage.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13339 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5a48784803
commit
49c553dc7f
@ -55,7 +55,7 @@ static mp_cmd_t mp_cmds[] = {
|
|||||||
{ MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } },
|
{ MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } },
|
||||||
#endif
|
#endif
|
||||||
{ MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
|
{ MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
|
||||||
{ MP_CMD_QUIT, "quit", 0, { {-1,{0}} } },
|
{ MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
|
||||||
{ MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
|
{ MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
|
||||||
{ MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} } },
|
{ MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} } },
|
||||||
{ MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
|
{ MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
|
||||||
|
@ -614,7 +614,7 @@ static int libmpdemux_was_interrupted(int eof) {
|
|||||||
if((cmd = mp_input_get_cmd(0,0)) != NULL) {
|
if((cmd = mp_input_get_cmd(0,0)) != NULL) {
|
||||||
switch(cmd->id) {
|
switch(cmd->id) {
|
||||||
case MP_CMD_QUIT:
|
case MP_CMD_QUIT:
|
||||||
exit_player_with_rc(MSGTR_Exit_quit, 0);
|
exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
|
||||||
case MP_CMD_PLAY_TREE_STEP: {
|
case MP_CMD_PLAY_TREE_STEP: {
|
||||||
eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
|
eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
|
||||||
} break;
|
} break;
|
||||||
@ -2541,7 +2541,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||||||
brk_cmd = 1;
|
brk_cmd = 1;
|
||||||
} break;
|
} break;
|
||||||
case MP_CMD_QUIT : {
|
case MP_CMD_QUIT : {
|
||||||
exit_player_with_rc(MSGTR_Exit_quit, 0);
|
exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
|
||||||
}
|
}
|
||||||
case MP_CMD_GRAB_FRAMES : {
|
case MP_CMD_GRAB_FRAMES : {
|
||||||
grab_frames=2;
|
grab_frames=2;
|
||||||
|
Loading…
Reference in New Issue
Block a user