summaryrefslogtreecommitdiffstats
path: root/video/out/vo.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-07-20 20:42:30 +0200
committerwm4 <wm4@nowhere>2016-07-20 20:42:30 +0200
commitbd9c0a10e577e7f839aabc27af6e186a9ba0cdaa (patch)
tree30ef3d3bbffa7e0e7693aed2619e26c2001269a3 /video/out/vo.h
parente11a20a8122b370b66235284dd4f67ce1f1bbc0b (diff)
downloadmpv-bd9c0a10e577e7f839aabc27af6e186a9ba0cdaa.tar.bz2
mpv-bd9c0a10e577e7f839aabc27af6e186a9ba0cdaa.tar.xz
vo_opengl: allow backends to provide callbacks for custom event loops
Until now, this has been either handled over vo.event_fd (which should go away), or by putting event handling on a separate thread. The backends which do the latter do it for a reason and won't need this, but X11 and Wayland will, in order to get rid of event_fd.
Diffstat (limited to 'video/out/vo.h')
-rw-r--r--video/out/vo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/vo.h b/video/out/vo.h
index 9c29d5f2cc..96f926be0a 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -282,7 +282,7 @@ struct vo_driver {
* immediately.
*/
void (*wakeup)(struct vo *vo);
- int (*wait_events)(struct vo *vo, int64_t until_time_us);
+ void (*wait_events)(struct vo *vo, int64_t until_time_us);
/*
* Closes driver. Should restore the original state of the system.
@@ -370,6 +370,7 @@ double vo_get_display_fps(struct vo *vo);
double vo_get_delay(struct vo *vo);
void vo_wakeup(struct vo *vo);
+void vo_wait_default(struct vo *vo, int64_t until_time);
struct mp_keymap {
int from;