From 95053ba78ba9b8ab683ae37301f6987b7992afba Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Tue, 16 Sep 2014 15:54:10 +0200 Subject: vo_wayland: remove unnecessary check buffer_pool_get_front now returns always a valid buffer. No need for corner cases. --- video/out/vo_wayland.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) (limited to 'video') diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index 86c52a440e..ac6c561526 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -373,28 +373,19 @@ static void frame_handle_redraw(void *data, struct vo_wayland_state *wl = p->wl; shm_buffer_t *buf = buffer_pool_get_front(&p->video_bufpool); - if (buf) { - wl_surface_attach(wl->window.video_surface, buf->buffer, p->x, p->y); - wl_surface_damage(wl->window.video_surface, 0, 0, p->dst_w, p->dst_h); + wl_surface_attach(wl->window.video_surface, buf->buffer, p->x, p->y); + wl_surface_damage(wl->window.video_surface, 0, 0, p->dst_w, p->dst_h); - if (callback) - wl_callback_destroy(callback); + if (callback) + wl_callback_destroy(callback); - p->redraw_callback = wl_surface_frame(wl->window.video_surface); - wl_callback_add_listener(p->redraw_callback, &frame_listener, p); - wl_surface_commit(wl->window.video_surface); - buffer_finalise_front(buf); + p->redraw_callback = wl_surface_frame(wl->window.video_surface); + wl_callback_add_listener(p->redraw_callback, &frame_listener, p); + wl_surface_commit(wl->window.video_surface); + buffer_finalise_front(buf); - p->x = 0; - p->y = 0; - } - else { - MP_WARN(wl, "Should not happen anymore (frame)\n"); - if (callback) - wl_callback_destroy(callback); - - p->redraw_callback = NULL; - } + p->x = 0; + p->y = 0; p->recent_flip_time = mp_time_us(); } -- cgit v1.2.3