diff options
| author | wm4 <wm4@nowhere> | 2015-02-12 22:41:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-12 22:41:45 +0100 |
| commit | aee0978d50e21d8f114382fdb9c014c029f71a04 (patch) | |
| tree | 5f53913088d11b7ae76da58f05a7845ed526485e /player | |
| parent | c59a4f12db96784b054f28d52eaa33cb7553d630 (diff) | |
| download | mpv-aee0978d50e21d8f114382fdb9c014c029f71a04.tar.bz2 mpv-aee0978d50e21d8f114382fdb9c014c029f71a04.tar.xz | |
player: add a --loop=force mode
Requested. See manpage additions.
This also makes the magical loop_times constants slightly saner, but
shouldn't change the semantics of any existing --loop option values.
Diffstat (limited to 'player')
| -rw-r--r-- | player/loadfile.c | 12 | ||||
| -rw-r--r-- | player/playloop.c | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 6560fe7806..d9d6a0036c 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1317,26 +1317,24 @@ struct playlist_entry *mp_next_file(struct MPContext *mpctx, int direction, while (next && next->playback_short) next = next->prev; // Always allow jumping to first file - if (!next && mpctx->opts->loop_times < 0) + if (!next && mpctx->opts->loop_times == 1) next = mpctx->playlist->first; } - if (!next && mpctx->opts->loop_times >= 0) { + if (!next && mpctx->opts->loop_times != 1) { if (direction > 0) { if (mpctx->opts->shuffle) playlist_shuffle(mpctx->playlist); next = mpctx->playlist->first; - if (next && mpctx->opts->loop_times > 1) { + if (next && mpctx->opts->loop_times > 1) mpctx->opts->loop_times--; - if (mpctx->opts->loop_times == 1) - mpctx->opts->loop_times = -1; - } } else { next = mpctx->playlist->last; // Don't jump to files that would immediately go to next file anyway while (next && next->playback_short) next = next->prev; } - if (!force && next && next->init_failed) { + bool ignore_failures = mpctx->opts->loop_times == -2; + if (!force && next && next->init_failed && !ignore_failures) { // Don't endless loop if no file in playlist is playable bool all_failed = true; struct playlist_entry *cur; diff --git a/player/playloop.c b/player/playloop.c index b2c82f036a..defc6ba6f3 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -813,7 +813,7 @@ static void handle_keep_open(struct MPContext *mpctx) struct MPOpts *opts = mpctx->opts; if (opts->keep_open && mpctx->stop_play == AT_END_OF_FILE && (opts->keep_open == 2 || !playlist_get_next(mpctx->playlist, 1)) && - opts->loop_times < 0) + opts->loop_times == 1) { mpctx->stop_play = KEEP_PLAYING; if (mpctx->d_video) { |