mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

waylandsink: remove callback and redraw_pending variables from the window structure

Browse source
This commit is contained in:
George Kiagiadakis 2014-02-13 11:32:00 +01:00
parent a7eb053708
commit 05f0842572
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/wayland/gstwaylandsink.c
View file

@ -179,9 +179,6 @@ gst_wayland_sink_set_property (GObject * object,
static void static void
destroy_window (struct window *window) destroy_window (struct window *window)
{ {
if (window->callback)
wl_callback_destroy (window->callback);
if (window->shell_surface) if (window->shell_surface)
wl_shell_surface_destroy (window->shell_surface); wl_shell_surface_destroy (window->shell_surface);
@ -330,7 +327,6 @@ create_window (GstWaylandSink * sink, GstWlDisplay * display, int width,
window = malloc (sizeof *window); window = malloc (sizeof *window);
window->width = width; window->width = width;
window->height = height; window->height = height;
window->redraw_pending = FALSE;
window->surface = wl_compositor_create_surface (display->compositor); window->surface = wl_compositor_create_surface (display->compositor);
@ -459,8 +455,6 @@ gst_wayland_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
static void static void
frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time) frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
{ {
struct window *window = (struct window *) data;
window->redraw_pending = FALSE;
GST_LOG ("frame_redraw_cb"); GST_LOG ("frame_redraw_cb");
wl_callback_destroy (callback); wl_callback_destroy (callback);
} }
@ -478,6 +472,7 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
GstWlMeta *meta; GstWlMeta *meta;
GstFlowReturn ret; GstFlowReturn ret;
struct window *window; struct window *window;
struct wl_callback *callback;
GST_LOG_OBJECT (sink, "render buffer %p", buffer); GST_LOG_OBJECT (sink, "render buffer %p", buffer);
if (!sink->window) if (!sink->window)
@ -520,9 +515,8 @@ gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
wl_surface_attach (sink->window->surface, meta->wbuffer, 0, 0); wl_surface_attach (sink->window->surface, meta->wbuffer, 0, 0);
wl_surface_damage (sink->window->surface, 0, 0, res.w, res.h); wl_surface_damage (sink->window->surface, 0, 0, res.w, res.h);
window->redraw_pending = TRUE; callback = wl_surface_frame (window->surface);
window->callback = wl_surface_frame (window->surface); wl_callback_add_listener (callback, &frame_callback_listener, window);
wl_callback_add_listener (window->callback, &frame_callback_listener, window);
wl_surface_commit (window->surface); wl_surface_commit (window->surface);
wl_display_flush (sink->display->display); wl_display_flush (sink->display->display);

3
ext/wayland/gstwaylandsink.h
View file

@ -64,9 +64,6 @@ struct window
int width, height; int width, height;
struct wl_surface *surface; struct wl_surface *surface;
struct wl_shell_surface *shell_surface; struct wl_shell_surface *shell_surface;
struct wl_callback *callback;
guint redraw_pending :1;
}; };
typedef struct _GstWaylandSink GstWaylandSink; typedef struct _GstWaylandSink GstWaylandSink;