RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Commands are read in a loop, but for some commands we need to break 

the loop to finish processing the command. Otherwise some commands
may appears as skiped to the user.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10410 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-07-11 07:54:52 +00:00
parent 15fb9c8396
commit 6ab50ab057
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mplayer.c
View File

@ -2423,7 +2423,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
{ {
mp_cmd_t* cmd; mp_cmd_t* cmd;
while( (cmd = mp_input_get_cmd(0,0)) != NULL) { int brk_cmd = 0;
while( !brk_cmd && (cmd = mp_input_get_cmd(0,0)) != NULL) {
switch(cmd->id) { switch(cmd->id) {
case MP_CMD_SEEK : { case MP_CMD_SEEK : {
int v,abs; int v,abs;
@ -2447,6 +2448,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
rel_seek_secs+= v; rel_seek_secs+= v;
osd_function= (v > 0) ? OSD_FFW : OSD_REW; osd_function= (v > 0) ? OSD_FFW : OSD_REW;
} }
brk_cmd = 1;
} break; } break;
#ifdef USE_EDL #ifdef USE_EDL
case MP_CMD_EDL_MARK: case MP_CMD_EDL_MARK:
@ -2464,6 +2466,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
} break; } break;
case MP_CMD_PAUSE : { case MP_CMD_PAUSE : {
osd_function=OSD_PAUSE; osd_function=OSD_PAUSE;
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, 0);
@ -2497,6 +2500,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
if(eof) if(eof)
play_tree_step = n; play_tree_step = n;
brk_cmd = 1;
} }
} break; } break;
case MP_CMD_PLAY_TREE_UP_STEP : { case MP_CMD_PLAY_TREE_UP_STEP : {
@ -2510,6 +2514,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_iter_free(i); play_tree_iter_free(i);
} else } else
eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV; eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV;
brk_cmd = 1;
} break; } break;
case MP_CMD_PLAY_ALT_SRC_STEP : { case MP_CMD_PLAY_ALT_SRC_STEP : {
if(playtree_iter && playtree_iter->num_files > 1) { if(playtree_iter && playtree_iter->num_files > 1) {
@ -2519,6 +2524,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
else if(v < 0 && playtree_iter->file > 1) else if(v < 0 && playtree_iter->file > 1)
eof = PT_PREV_SRC; eof = PT_PREV_SRC;
} }
brk_cmd = 1;
} break; } break;
case MP_CMD_SUB_DELAY : { case MP_CMD_SUB_DELAY : {
int abs= cmd->args[1].v.i; int abs= cmd->args[1].v.i;
@ -2589,6 +2595,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_set_child(playtree,e); play_tree_set_child(playtree,e);
play_tree_iter_step(playtree_iter,0,0); play_tree_iter_step(playtree_iter,0,0);
eof = PT_NEXT_SRC; eof = PT_NEXT_SRC;
brk_cmd = 1;
} break; } break;
case MP_CMD_LOADLIST : { case MP_CMD_LOADLIST : {
play_tree_t* e = parse_playlist_file(cmd->args[0].v.s); play_tree_t* e = parse_playlist_file(cmd->args[0].v.s);
@ -2603,6 +2610,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
play_tree_iter_step(playtree_iter,0,0); play_tree_iter_step(playtree_iter,0,0);
eof = PT_NEXT_SRC; eof = PT_NEXT_SRC;
} }
brk_cmd = 1;
} break; } break;
case MP_CMD_GAMMA : { case MP_CMD_GAMMA : {
int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;