diff options
author | wm4 <wm4@nowhere> | 2014-08-15 23:32:37 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-15 23:32:37 +0200 |
commit | fa7c421588cb856481a948d2a95eef7c9e228b45 (patch) | |
tree | 34ca0ab3d1cac35135b07cb67d4646221d140158 /player/sub.c | |
parent | 318e8da25071a76a3d88944304ae91f6d25d7f43 (diff) | |
download | mpv-fa7c421588cb856481a948d2a95eef7c9e228b45.tar.bz2 mpv-fa7c421588cb856481a948d2a95eef7c9e228b45.tar.xz |
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.
Diffstat (limited to 'player/sub.c')
-rw-r--r-- | player/sub.c | 9 |
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; |