diff options
| author | wm4 <wm4@nowhere> | 2016-07-20 20:42:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-07-20 20:42:30 +0200 |
| commit | bd9c0a10e577e7f839aabc27af6e186a9ba0cdaa (patch) | |
| tree | 30ef3d3bbffa7e0e7693aed2619e26c2001269a3 /video/out/vo_sdl.c | |
| parent | e11a20a8122b370b66235284dd4f67ce1f1bbc0b (diff) | |
| download | mpv-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_sdl.c')
| -rw-r--r-- | video/out/vo_sdl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index dd18f6e9c4..d33ace147a 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -533,7 +533,7 @@ static void wakeup(struct vo *vo) SDL_PushEvent(&event); } -static int wait_events(struct vo *vo, int64_t until_time_us) +static void wait_events(struct vo *vo, int64_t until_time_us) { int64_t wait_us = until_time_us - mp_time_us(); int timeout_ms = MPCLAMP((wait_us + 500) / 1000, 0, 10000); @@ -619,8 +619,6 @@ static int wait_events(struct vo *vo, int64_t until_time_us) break; } } - - return 0; } static void uninit(struct vo *vo) |