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 /video/out/vo.h | |
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 'video/out/vo.h')
-rw-r--r-- | video/out/vo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/video/out/vo.h b/video/out/vo.h index c40367d406..e35085c49b 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -169,6 +169,8 @@ struct vo_extra { struct osd_state *osd; struct encode_lavc_context *encode_lavc_ctx; struct mpv_opengl_cb_context *opengl_cb_context; + void (*wakeup_cb)(void *ctx); + void *wakeup_ctx; }; struct vo_frame { |