diff options
author | wm4 <wm4@nowhere> | 2018-05-17 13:13:00 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:34 +0200 |
commit | 4d2b3fca3b5c6e61d2ff3a22f78b1b640500808e (patch) | |
tree | e7427fbb456f6e0eece7223ed30600e6e9865227 /player/loadfile.c | |
parent | 972989db7e63c199edb605884bb2594eaecc9569 (diff) | |
download | mpv-4d2b3fca3b5c6e61d2ff3a22f78b1b640500808e.tar.bz2 mpv-4d2b3fca3b5c6e61d2ff3a22f78b1b640500808e.tar.xz |
player: don't reset last_seek_pts on playback state reset
This is nonsense. Didn't matter in most situations, because seeking
itself set this after it was cleared. But some callers don't do this,
see e.g. commit ed73ba89644fc6. There is no need to clear it at all, and
it causes issues with the next commit. It only needs to be reset on
loading.
Also move the initialization on loading up, which doesn't change
behavior, but makes the intention clearer.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r-- | player/loadfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index c4e013793d..a16df30eed 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1285,15 +1285,14 @@ static void play_current_file(struct MPContext *mpctx) mpctx->speed_factor_a = mpctx->speed_factor_v = 1.0; mpctx->display_sync_error = 0.0; mpctx->display_sync_active = false; + // let get_current_time() show 0 as start time (before playback_pts is set) + mpctx->last_seek_pts = 0.0; mpctx->seek = (struct seek_params){ 0 }; mpctx->filter_root = mp_filter_create_root(mpctx->global); mp_filter_root_set_wakeup_cb(mpctx->filter_root, mp_wakeup_core_cb, mpctx); reset_playback_state(mpctx); - // let get_current_time() show 0 as start time (before playback_pts is set) - mpctx->last_seek_pts = 0.0; - mpctx->playing = mpctx->playlist->current; if (!mpctx->playing || !mpctx->playing->filename) goto terminate_playback; |