diff options
author | wm4 <wm4@nowhere> | 2016-04-21 22:15:17 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-04-21 22:15:36 +0200 |
commit | 1944a34c230b6afb7707fe4fb5eb0c613b96db9b (patch) | |
tree | 4450c51dc39341055ffbd50a084ec26e26d6a804 /player/osd.c | |
parent | 78346e9c9a8a70fa581989b2cc8b4e0933765330 (diff) | |
download | mpv-1944a34c230b6afb7707fe4fb5eb0c613b96db9b.tar.bz2 mpv-1944a34c230b6afb7707fe4fb5eb0c613b96db9b.tar.xz |
command: if only ab-loop-b is set, loop from start of file
Commit 382bafcb changed the behavior for ab-loop-a. This commit changes
ab-loop-b so that the behavior is symmetric.
Adjust the OSD rendering accordingly to the two changes.
Also fix mentions of the "ab_loop" command to the now preferred
"ab-loop".
Diffstat (limited to 'player/osd.c')
-rw-r--r-- | player/osd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/player/osd.c b/player/osd.c index 7da4a038bf..810df73719 100644 --- a/player/osd.c +++ b/player/osd.c @@ -362,14 +362,15 @@ void set_osd_bar_chapters(struct MPContext *mpctx, int type) mpctx->osd_progbar.num_stops = 0; double len = get_time_length(mpctx); if (len > 0) { - if (opts->ab_loop[0] != MP_NOPTS_VALUE && - opts->ab_loop[1] != MP_NOPTS_VALUE) - { + if (opts->ab_loop[0] != MP_NOPTS_VALUE) { MP_TARRAY_APPEND(mpctx, mpctx->osd_progbar.stops, mpctx->osd_progbar.num_stops, opts->ab_loop[0] / len); + } + if (opts->ab_loop[1] != MP_NOPTS_VALUE) { MP_TARRAY_APPEND(mpctx, mpctx->osd_progbar.stops, mpctx->osd_progbar.num_stops, opts->ab_loop[1] / len); - } else { + } + if (mpctx->osd_progbar.stops == 0) { int num = get_chapter_count(mpctx); for (int n = 0; n < num; n++) { double time = chapter_start_time(mpctx, n); |