From 382bafcb1349855c2871bbe0a813f8493e1bd9f7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 18 Apr 2016 21:32:58 +0200 Subject: player: loop on end of file if ab-loop-b is unset Possibly slightly more useful/intuitive. --- player/command.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index e3a3313f79..cdadafa892 100644 --- a/player/command.c +++ b/player/command.c @@ -5245,12 +5245,13 @@ void handle_ab_loop(struct MPContext *mpctx) struct MPOpts *opts = mpctx->opts; double now = mpctx->restart_complete ? mpctx->playback_pts : MP_NOPTS_VALUE; - if (now != MP_NOPTS_VALUE && opts->ab_loop[0] != MP_NOPTS_VALUE && - opts->ab_loop[1] != MP_NOPTS_VALUE) - { + if (now != MP_NOPTS_VALUE && opts->ab_loop[0] != MP_NOPTS_VALUE) { + double end = opts->ab_loop[1]; + if (end == MP_NOPTS_VALUE) + end = INFINITY; if (ctx->prev_pts >= opts->ab_loop[0] && - ctx->prev_pts < opts->ab_loop[1] && - (now >= opts->ab_loop[1] || mpctx->stop_play == AT_END_OF_FILE)) + ctx->prev_pts < end && + (now >= end || mpctx->stop_play == AT_END_OF_FILE)) { mark_seek(mpctx); queue_seek(mpctx, MPSEEK_ABSOLUTE, opts->ab_loop[0], -- cgit v1.2.3