From 1aef780b6cd7743df7e21cfb7dc45ad5f99e0825 Mon Sep 17 00:00:00 2001 From: Tsukasa OMOTO Date: Mon, 30 Jun 2014 02:44:32 +0900 Subject: options: support setting start time relative to start PTS Signed-off-by: wm4 --- player/misc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'player/misc.c') diff --git a/player/misc.c b/player/misc.c index 6eae646242..6aa58863e8 100644 --- a/player/misc.c +++ b/player/misc.c @@ -53,12 +53,17 @@ double get_relative_time(struct MPContext *mpctx) double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t) { double length = get_time_length(mpctx); + double start = get_start_time(mpctx); switch (t.type) { case REL_TIME_ABSOLUTE: return t.pos; - case REL_TIME_NEGATIVE: - if (length != 0) - return MPMAX(length - t.pos, 0.0); + case REL_TIME_RELATIVE: + if (t.pos >= 0) { + return start + t.pos; + } else { + if (length != 0) + return MPMAX(start + length + t.pos, 0.0); + } break; case REL_TIME_PERCENT: if (length != 0) -- cgit v1.2.3