summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2014-09-16 15:54:10 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2014-09-16 15:54:10 +0200
commit95053ba78ba9b8ab683ae37301f6987b7992afba (patch)
treecf56301b1589c660fc68743d5af1b2020a620942 /video
parent20643b6c91beedb97fb90cd710abf8c83979087b (diff)
downloadmpv-95053ba78ba9b8ab683ae37301f6987b7992afba.tar.bz2
mpv-95053ba78ba9b8ab683ae37301f6987b7992afba.tar.xz
vo_wayland: remove unnecessary check
buffer_pool_get_front now returns always a valid buffer. No need for corner cases.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_wayland.c29
1 files changed, 10 insertions, 19 deletions
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();
}