player: use virtual time for --audio-file with ordered chapters

Apparently users prefer this behavior.

It was used for subtitles too, so move the code to calculate the video
offset into a separate function. Seeking also needs to be fixed.

Fixes #1018.

1 files changed, 2 insertions, 1 deletions

diff --git a/player/playloop.c b/player/playloop.c
index ae875f380a..33e3f050cd 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -236,10 +236,11 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek,
         if (track->selected && track->is_external && track->demuxer) {
             double main_new_pos;
             if (seek.type == MPSEEK_ABSOLUTE) {
-                main_new_pos = seek.amount - mpctx->video_offset;
+                main_new_pos = seek.amount;
             } else {
                 main_new_pos = get_main_demux_pts(mpctx);
             }
+            main_new_pos -= get_track_video_offset(mpctx, track);
             demux_seek(track->demuxer, main_new_pos, SEEK_ABSOLUTE);
         }
     }