summaryrefslogtreecommitdiffstats
path: root/player/main.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-19 18:25:54 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:35 +0200
commit8816e1117ee65039dbb5700219ba3537d3e5290e (patch)
tree346500d09a27d91a1cd5c4e987b052e635e64978 /player/main.c
parentc24520b7f3651dbd4cbdffe93a187c3d213ff845 (diff)
downloadmpv-8816e1117ee65039dbb5700219ba3537d3e5290e.tar.bz2
mpv-8816e1117ee65039dbb5700219ba3537d3e5290e.tar.xz
player: change the role of the "stop_play" and "playing" variable
Before this, mpctx->playing was often used to determine whether certain new state could be added to the playback state. In particular this affected external files (which added tracks and demuxers). The variable was checked to prevent that they were added before the corresponding uninit code. We want to make a small part of uninit asynchronous, but mpctx->playing needs to stay in the place where it is. It can't be used for this purpose anymore. Use mpctx->stop_play instead. Make it never have the value 0 outside of loading/playback. On unloading, it obviously has to be non-0. Change some other code in playloop.c to use this, because it seems slightly more correct. But mostly this is preparation for the following commit.
Diffstat (limited to 'player/main.c')
-rw-r--r--player/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/player/main.c b/player/main.c
index 6d2b862e02..6a7fc68004 100644
--- a/player/main.c
+++ b/player/main.c
@@ -283,6 +283,7 @@ struct MPContext *mp_create(void)
.dispatch = mp_dispatch_create(mpctx),
.playback_abort = mp_cancel_new(mpctx),
.thread_pool = mp_thread_pool_create(mpctx, 0, 1, 30),
+ .stop_play = PT_STOP,
};
pthread_mutex_init(&mpctx->abort_lock, NULL);