summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-04-14 18:22:45 +0200
committerwm4 <wm4@nowhere>2017-04-14 18:22:45 +0200
commit419624fb068ed4e7f449fa4fd0dda8edf161ac1c (patch)
treed74b3c2c12fdf79aa8bb8cc6f289b7b7d7e2ceca /player/loadfile.c
parentae0a40259fa9ce45d34c966da067e20a69156330 (diff)
downloadmpv-419624fb068ed4e7f449fa4fd0dda8edf161ac1c.tar.bz2
mpv-419624fb068ed4e7f449fa4fd0dda8edf161ac1c.tar.xz
player: unmess pause state handling
Merge the pause_player() and unpause_player() functions. Make sure the pause events are emitted properly. We can now set the internal pause state based on a predicate, instead of e.g. handle_pause_on_low_cache() making a mess to trigger the internal pause state as wanted. Preparation for some more changes.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 7c6894033d..1542e16e49 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1268,8 +1268,7 @@ reopen_file:
execute_queued_seek(mpctx);
}
- if (mpctx->opts->pause)
- pause_player(mpctx);
+ update_internal_pause_state(mpctx);
open_recorder(mpctx, true);