From 8f59549ec515f3eca0ea88738031f988c3b3537b Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 23 Jan 2015 17:27:42 +1100 Subject: [PATCH] gl/tests: update glwindow api change --- tests/check/libs/gstglcontext.c | 6 ++++-- tests/check/libs/gstglupload.c | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/check/libs/gstglcontext.c b/tests/check/libs/gstglcontext.c index ba0b1a98b2..20c4708022 100644 --- a/tests/check/libs/gstglcontext.c +++ b/tests/check/libs/gstglcontext.c @@ -259,7 +259,8 @@ GST_START_TEST (test_share) error ? error->message : "Unknown Error"); /* make the window visible */ - gst_gl_window_draw (window, 320, 240); + gst_gl_window_set_preferred_size (window, 320, 240); + gst_gl_window_draw (window); gst_gl_window_send_message (other_window, GST_GL_WINDOW_CB (init), context); @@ -360,7 +361,8 @@ GST_START_TEST (test_wrapped_context) error ? error->message : "Unknown Error"); /* make the window visible */ - gst_gl_window_draw (window, 320, 240); + gst_gl_window_set_preferred_size (window, 320, 240); + gst_gl_window_draw (window); gst_gl_window_send_message (other_window, GST_GL_WINDOW_CB (init), context); diff --git a/tests/check/libs/gstglupload.c b/tests/check/libs/gstglupload.c index 8ec960fa0c..214d36a1fc 100644 --- a/tests/check/libs/gstglupload.c +++ b/tests/check/libs/gstglupload.c @@ -254,7 +254,8 @@ GST_START_TEST (test_upload_data) gst_buffer_unmap (outbuf, &map_info); - gst_gl_window_draw (window, WIDTH, HEIGHT); + gst_gl_window_set_preferred_size (window, WIDTH, HEIGHT); + gst_gl_window_draw (window); gst_gl_window_send_message (window, GST_GL_WINDOW_CB (init), context); @@ -307,7 +308,8 @@ GST_START_TEST (test_upload_buffer) gst_gl_context_get_error ()); fail_unless (GST_IS_BUFFER (outbuf)); - gst_gl_window_draw (window, WIDTH, HEIGHT); + gst_gl_window_set_preferred_size (window, WIDTH, HEIGHT); + gst_gl_window_draw (window); gst_gl_window_send_message (window, GST_GL_WINDOW_CB (init), context); while (i < 2) { @@ -360,7 +362,9 @@ GST_START_TEST (test_upload_meta_producer) fail_if (res == FALSE, "Failed to upload GstVideoGLTextureUploadMeta\n"); tex_id = tex_ids[0]; - gst_gl_window_draw (window, WIDTH, HEIGHT); + + gst_gl_window_set_preferred_size (window, WIDTH, HEIGHT); + gst_gl_window_draw (window); gst_gl_window_send_message (window, GST_GL_WINDOW_CB (init), context); while (i < 2) {