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

core: fix detection of files with no chapters 

Initialize mpctx->last_chapter_seek to -2 instead of -1. This changes
get_current_chapter() return value to -2 for files which have no
chapters. -2 is used by some commands related to chapters to recognize
files without chapters and return failure without any effect in that
case.
This commit is contained in:
Uoti Urpala 2011-08-04 23:14:44 +03:00
parent 0ece360eea
commit 35ef4d02d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mplayer.c
View File

@ -3200,7 +3200,7 @@ static int seek(MPContext *mpctx, struct seek_params seek,
|| seek.type == MPSEEK_ABSOLUTE || seek.type == MPSEEK_ABSOLUTE
&& seek.amount < mpctx->last_chapter_pts && seek.amount < mpctx->last_chapter_pts
|| seek.amount < 0) || seek.amount < 0)
mpctx->last_chapter_seek = -1; mpctx->last_chapter_seek = -2;
if (mpctx->timeline && seek.type == MPSEEK_FACTOR) { if (mpctx->timeline && seek.type == MPSEEK_FACTOR) {
seek.amount *= mpctx->timeline[mpctx->num_timeline_parts].start; seek.amount *= mpctx->timeline[mpctx->num_timeline_parts].start;
seek.type = MPSEEK_ABSOLUTE; seek.type = MPSEEK_ABSOLUTE;
@ -3400,7 +3400,7 @@ char *chapter_display_name(struct MPContext *mpctx, int chapter)
int seek_chapter(struct MPContext *mpctx, int chapter, double *seek_pts, int seek_chapter(struct MPContext *mpctx, int chapter, double *seek_pts,
char **chapter_name) char **chapter_name)
{ {
mpctx->last_chapter_seek = -1; mpctx->last_chapter_seek = -2;
if (!mpctx->chapters || !mpctx->sh_video) { if (!mpctx->chapters || !mpctx->sh_video) {
int res = demuxer_seek_chapter(mpctx->demuxer, chapter, seek_pts, int res = demuxer_seek_chapter(mpctx->demuxer, chapter, seek_pts,
chapter_name); chapter_name);
@ -4825,7 +4825,7 @@ if(play_n_frames==0){
mpctx->hrseek_framedrop = false; mpctx->hrseek_framedrop = false;
mpctx->step_frames = 0; mpctx->step_frames = 0;
mpctx->total_avsync_change = 0; mpctx->total_avsync_change = 0;
mpctx->last_chapter_seek = -1; mpctx->last_chapter_seek = -2;
// If there's a timeline force an absolute seek to initialize state // If there's a timeline force an absolute seek to initialize state
if (opts->seek_to_sec || mpctx->timeline) { if (opts->seek_to_sec || mpctx->timeline) {