diff options
author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-05-16 16:43:34 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-26 16:44:19 +0200 |
commit | bb9b6501fda409420acda7e41cec7eb990037f50 (patch) | |
tree | daa1f6c939dc6c7ef5f3be768bf8a4d5bb9353c8 /video/out/gl_wayland.c | |
parent | e6a225d57a60be62bd6bd7c758e9460e53775585 (diff) | |
download | mpv-bb9b6501fda409420acda7e41cec7eb990037f50.tar.bz2 mpv-bb9b6501fda409420acda7e41cec7eb990037f50.tar.xz |
wayland: introduce vo_wayland_config
This removes the need for exposing vo_wayland_fullscreen and other functions
also this will be usefull for other vos in the future.
Diffstat (limited to 'video/out/gl_wayland.c')
-rw-r--r-- | video/out/gl_wayland.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c index fab61edb64..7fb9c4d810 100644 --- a/video/out/gl_wayland.c +++ b/video/out/gl_wayland.c @@ -184,13 +184,9 @@ static bool config_window_wayland(struct MPGLContext *ctx, wl->window->resize_func = egl_resize_func; wl->window->resize_func_data = (void*) egl_ctx; - wl->window->width = d_width; - wl->window->height = d_height; - vo_wayland_update_window_title(ctx->vo); - - if ((VOFLAG_FULLSCREEN & flags) && wl->window->type != TYPE_FULLSCREEN) - vo_wayland_fullscreen(ctx->vo); + if (!vo_wayland_config(ctx->vo, d_width, d_height, flags)) + return false; if (!egl_ctx->egl.ctx) { /* Create OpenGL context */ @@ -244,7 +240,6 @@ void mpgl_set_backend_wayland(MPGLContext *ctx) ctx->config_window = config_window_wayland; ctx->releaseGlContext = releaseGlContext_wayland; ctx->swapGlBuffers = swapGlBuffers_wayland; - ctx->check_events = vo_wayland_check_events; ctx->vo_control = vo_wayland_control; ctx->vo_init = vo_wayland_init; ctx->vo_uninit = vo_wayland_uninit; |