From f008fa71abadbd1ccc5ae941256a0a6f9ff9a865 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Wed, 16 Nov 2011 16:53:25 +0100 Subject: [PATCH] [467/906] tests: various build fixes - cmake could not find glib - put gtk variables at the beginning to avoid GL conflicts - update examples to clutter-1.8 - use const instead of deprecated G_CONST_RETURN - set max pending events to 0 to make cube example works again --- gst-libs/gst/gl/gstglshader.c | 4 ++-- gst-libs/gst/gl/gstglshader.h | 4 ++-- gst-libs/gst/gl/gstglwindow_x11.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index c2aadd7d40..45fb3e3d94 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -219,14 +219,14 @@ gst_gl_shader_set_fragment_source (GstGLShader * shader, const gchar * src) priv->fragment_src = g_strdup (src); } -G_CONST_RETURN gchar * +const gchar * gst_gl_shader_get_vertex_source (GstGLShader * shader) { g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL); return shader->priv->vertex_src; } -G_CONST_RETURN gchar * +const gchar * gst_gl_shader_get_fragment_source (GstGLShader * shader) { g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL); diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index 1e3914df37..a63316b930 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -79,8 +79,8 @@ void gst_gl_shader_set_vertex_source (GstGLShader *shader, const gchar *src); void gst_gl_shader_set_fragment_source (GstGLShader *shader, const gchar *src); -G_CONST_RETURN gchar * gst_gl_shader_get_vertex_source (GstGLShader *shader); -G_CONST_RETURN gchar * gst_gl_shader_get_fragment_source (GstGLShader *shader); +const gchar * gst_gl_shader_get_vertex_source (GstGLShader *shader); +const gchar * gst_gl_shader_get_fragment_source (GstGLShader *shader); void gst_gl_shader_set_active (GstGLShader *shader, gboolean active); diff --git a/gst-libs/gst/gl/gstglwindow_x11.c b/gst-libs/gst/gl/gstglwindow_x11.c index dfb18fd7c4..46c69aab8a 100644 --- a/gst-libs/gst/gl/gstglwindow_x11.c +++ b/gst-libs/gst/gl/gstglwindow_x11.c @@ -90,7 +90,8 @@ G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT); gboolean _gst_gl_window_debug = FALSE; -void gst_gl_window_init_platform () +void +gst_gl_window_init_platform () { } @@ -648,7 +649,7 @@ gst_gl_window_run_loop (GstGLWindow * window) g_mutex_lock (priv->x_lock); // use in generic/cube and other related uses - priv->allow_extra_expose_events = XPending (priv->device) <= 2; + priv->allow_extra_expose_events = XPending (priv->device) <= 0; switch (event.type) { case ClientMessage: