diff options
| author | wm4 <wm4@nowhere> | 2016-09-16 14:23:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-16 14:37:48 +0200 |
| commit | b8ade7c99b830ee9870040bcfc1f2c3d3a64d172 (patch) | |
| tree | 48df8031d90be4e6e1f9c9c4045a72e21c33862c /player/video.c | |
| parent | f845f64c2abe4361084b4bc07f5f1ea5dd43ec9f (diff) | |
| download | mpv-b8ade7c99b830ee9870040bcfc1f2c3d3a64d172.tar.bz2 mpv-b8ade7c99b830ee9870040bcfc1f2c3d3a64d172.tar.xz | |
player, ao, vo: don't call mp_input_wakeup() directly
Currently, calling mp_input_wakeup() will wake up the core thread (also
called the playloop). This seems odd, but currently the core indeed
calls mp_input_wait() when it has nothing more to do. It's done this way
because MPlayer used input_ctx as central "mainloop".
This is probably going to change. Remove direct calls to this function,
and replace it with mp_wakeup_core() calls. ao and vo are changed to use
opaque callbacks and not use input_ctx for this purpose. Other code
already uses opaque callbacks, or has legitimate reasons to use
input_ctx directly (such as sending actual user input).
Diffstat (limited to 'player/video.c')
| -rw-r--r-- | player/video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/player/video.c b/player/video.c index 5e87564690..e66426f24d 100644 --- a/player/video.c +++ b/player/video.c @@ -466,6 +466,8 @@ int reinit_video_chain_src(struct MPContext *mpctx, struct lavfi_pad *src) .osd = mpctx->osd, .encode_lavc_ctx = mpctx->encode_lavc_ctx, .opengl_cb_context = mpctx->gl_cb_ctx, + .wakeup_cb = mp_wakeup_core_cb, + .wakeup_ctx = mpctx, }; mpctx->video_out = init_best_video_out(mpctx->global, &ex); if (!mpctx->video_out) { |