From 759fdcb2f9b2b58e83ed7206600082f46979567f Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Wed, 20 Aug 2014 16:40:33 +0200 Subject: vo_wayland: fix formatting inconsistencies --- video/out/vo_wayland.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'video') diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index 92d7d56f68..dc9fc748a1 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -48,6 +48,7 @@ #include "wayland-version.h" static void draw_image(struct vo *vo, mp_image_t *mpi); +static void draw_osd(struct vo *vo); static const struct wl_callback_listener frame_listener; static const struct wl_buffer_listener buffer_listener; @@ -171,8 +172,6 @@ struct priv { int use_triplebuffering; }; -static void draw_osd(struct vo *vo); - /* copied from weston clients */ static int set_cloexec_or_close(int fd) { @@ -372,8 +371,10 @@ static void buffer_pool_reinit(struct priv *p, struct wl_shm *shm) { pool->shm = shm; + if (!pool->buffers) pool->buffers = calloc(buffer_no, sizeof(struct buffer)); + pool->buffer_no = buffer_no; pool->format = fmt->wl_fmt; pool->bytes_per_pixel = mp_imgfmt_get_desc(fmt->mp_fmt).bytes[0]; @@ -476,7 +477,6 @@ static struct buffer * buffer_pool_get_no(struct buffer_pool *pool, uint32_t no) return &pool->buffers[no]; } - static bool redraw_frame(struct priv *p) { draw_image(p->vo, NULL); @@ -910,7 +910,7 @@ static int control(struct vo *vo, uint32_t request, void *data) { struct voctrl_screenshot_args *args = data; args->out_image = get_screenshot(p); - return true; + return VO_TRUE; } case VOCTRL_GET_RECENT_FLIP_TIME: { -- cgit v1.2.3