diff options
| author | wm4 <wm4@nowhere> | 2014-03-25 02:18:12 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-03-25 02:18:12 +0100 |
| commit | c19c777061531d4831f93ddc34490e6537448c19 (patch) | |
| tree | 8942fd90d92e5531b620db4ea0aef93ce5970f52 /player | |
| parent | 5cae4a807ca3d3c04932490f0b6f72ce1bf57a53 (diff) | |
| download | mpv-c19c777061531d4831f93ddc34490e6537448c19.tar.bz2 mpv-c19c777061531d4831f93ddc34490e6537448c19.tar.xz | |
player: let chapter_start_time() return MP_NOPTS_VALUE for unknown times
Diffstat (limited to 'player')
| -rw-r--r-- | player/command.c | 2 | ||||
| -rw-r--r-- | player/misc.c | 2 | ||||
| -rw-r--r-- | player/playloop.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c index d9854af9e8..52a98fff86 100644 --- a/player/command.c +++ b/player/command.c @@ -490,7 +490,7 @@ static int mp_property_chapter(m_option_t *prop, int action, void *arg, chapter_start_time(mpctx, chapter); // If we are far enough into a chapter, seek back to the // beginning of current chapter instead of previous one - if (current_chapter_start >= 0 && + if (current_chapter_start != MP_NOPTS_VALUE && get_current_time(mpctx) - current_chapter_start > mpctx->opts->chapter_seek_threshold) step_all++; diff --git a/player/misc.c b/player/misc.c index 700def3ae4..1bfca9df92 100644 --- a/player/misc.c +++ b/player/misc.c @@ -66,7 +66,7 @@ double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t, return length * (t.pos / 100.0); break; case REL_TIME_CHAPTER: - if (chapter_start_time(mpctx, t.pos) >= 0) + if (chapter_start_time(mpctx, t.pos) != MP_NOPTS_VALUE) return chapter_start_time(mpctx, t.pos); break; } diff --git a/player/playloop.c b/player/playloop.c index fa014d7397..6121c7367c 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -547,7 +547,7 @@ double chapter_start_time(struct MPContext *mpctx, int chapter) return get_start_time(mpctx); if (chapter >= 0 && chapter < mpctx->num_chapters) return mpctx->chapters[chapter].start; - return -1.0; + return MP_NOPTS_VALUE; } int get_chapter_count(struct MPContext *mpctx) @@ -567,7 +567,7 @@ bool mp_seek_chapter(struct MPContext *mpctx, int chapter) mpctx->last_chapter_seek = -2; double pts = chapter_start_time(mpctx, chapter); - if (pts == -1.0) + if (pts == MP_NOPTS_VALUE) return false; queue_seek(mpctx, MPSEEK_ABSOLUTE, pts, 0, true); |