mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

[467/906] tests: various build fixes

Browse source 
- 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
This commit is contained in:
Julien Isorce 2011-11-16 16:53:25 +01:00 committed by Tim-Philipp Müller
parent 4f09396824
commit f008fa71ab
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/gstglshader.c
View file

@ -219,14 +219,14 @@ gst_gl_shader_set_fragment_source (GstGLShader * shader, const gchar * src)
priv->fragment_src = g_strdup (src); priv->fragment_src = g_strdup (src);
} }
G_CONST_RETURN gchar * const gchar *
gst_gl_shader_get_vertex_source (GstGLShader * shader) gst_gl_shader_get_vertex_source (GstGLShader * shader)
{ {
g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL); g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL);
return shader->priv->vertex_src; return shader->priv->vertex_src;
} }
G_CONST_RETURN gchar * const gchar *
gst_gl_shader_get_fragment_source (GstGLShader * shader) gst_gl_shader_get_fragment_source (GstGLShader * shader)
{ {
g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL); g_return_val_if_fail (GST_GL_IS_SHADER (shader), NULL);

4
gst-libs/gst/gl/gstglshader.h
View file

@ -79,8 +79,8 @@ void gst_gl_shader_set_vertex_source (GstGLShader *shader,
const gchar *src); const gchar *src);
void gst_gl_shader_set_fragment_source (GstGLShader *shader, void gst_gl_shader_set_fragment_source (GstGLShader *shader,
const gchar *src); const gchar *src);
G_CONST_RETURN gchar * gst_gl_shader_get_vertex_source (GstGLShader *shader); const 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_fragment_source (GstGLShader *shader);
void gst_gl_shader_set_active (GstGLShader *shader, void gst_gl_shader_set_active (GstGLShader *shader,
gboolean active); gboolean active);

5
gst-libs/gst/gl/gstglwindow_x11.c
View file

@ -90,7 +90,8 @@ G_DEFINE_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT);
gboolean _gst_gl_window_debug = FALSE; 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); g_mutex_lock (priv->x_lock);
// use in generic/cube and other related uses // 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) { switch (event.type) {
case ClientMessage: case ClientMessage: