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

player: move code to make playloop smaller 

This is basically a cosmetic change, although it weirdly also affects
the percent position in encoding mode.
This commit is contained in:
wm4 2014-09-25 20:42:59 +02:00
parent d23ffd243f
commit 07668e50de
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
player/misc.c
View File

@ -80,8 +80,9 @@ double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t)
double get_play_end_pts(struct MPContext *mpctx)
{
struct MPOpts *opts = mpctx->opts;
double end = MP_NOPTS_VALUE;
if (opts->play_end.type) {
return rel_time_to_abs(mpctx, opts->play_end);
end = rel_time_to_abs(mpctx, opts->play_end);
} else if (opts->play_length.type) {
double startpts = get_start_time(mpctx);
double start = rel_time_to_abs(mpctx, opts->play_start);
@ -89,9 +90,14 @@ double get_play_end_pts(struct MPContext *mpctx)
start = startpts;
double length = rel_time_to_abs(mpctx, opts->play_length);
if (start != MP_NOPTS_VALUE && length != MP_NOPTS_VALUE)
return start + length;
end = start + length;
}
return MP_NOPTS_VALUE;
if (opts->chapterrange[1] > 0) {
double cend = chapter_start_time(mpctx, opts->chapterrange[1]);
if (cend != MP_NOPTS_VALUE && (end == MP_NOPTS_VALUE || cend < end))
end = cend;
}
return end;
}
// Time used to seek external tracks to.

6
player/playloop.c
View File

@ -859,12 +859,6 @@ void run_playloop(struct MPContext *mpctx)
}
}
if (opts->chapterrange[1] > 0) {
double end = chapter_start_time(mpctx, opts->chapterrange[1]);
if (end != MP_NOPTS_VALUE && (endpts == MP_NOPTS_VALUE || end < endpts))
endpts = end;
}
handle_cursor_autohide(mpctx);
handle_heartbeat_cmd(mpctx);