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, 1 insertions, 8 deletions

diff --git a/player/sub.c b/player/sub.c
index 7f01a17961..a4b4baddc8 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -106,14 +106,7 @@ static void update_subtitle(struct MPContext *mpctx, int order)
 
     struct osd_sub_state state;
     osd_get_sub(mpctx->osd, obj, &state);
-
-    state.video_offset = 0;
-    if (track->under_timeline) {
-        state.video_offset += mpctx->video_offset;
-    } else if (track->is_external) {
-        state.video_offset += get_start_time(mpctx);
-    };
-
+    state.video_offset = get_track_video_offset(mpctx, track);
     osd_set_sub(mpctx->osd, obj, &state);
 
     double refpts_s = mpctx->playback_pts - state.video_offset;