From efbb91999796a33c91761d2c206d0f42beb4954c Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 24 Nov 2017 13:58:57 +0100 Subject: player: minor fix/simplification of OSD time/duration handling Always display the duration as "unknown" if the duration is known. Also fix that at least demux_lavf reported unknown duration as 0 (fix by setting the default to unknown in demux.c). Remove the dumb _u formatter function, and use a different approach to avoiding displaying "unknown" as playback time on playback start (set last_seek_pts for that). --- player/playloop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'player/playloop.c') diff --git a/player/playloop.c b/player/playloop.c index 0c44042ab1..c53dd0fed0 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -438,11 +438,11 @@ void execute_queued_seek(struct MPContext *mpctx) } } -// -1 if unknown +// NOPTS (i.e. <0) if unknown double get_time_length(struct MPContext *mpctx) { struct demuxer *demuxer = mpctx->demuxer; - return demuxer ? demuxer->duration : -1; + return demuxer && demuxer->duration >= 0 ? demuxer->duration : MP_NOPTS_VALUE; } double get_current_time(struct MPContext *mpctx) -- cgit v1.2.3