gl: silence all the compiler warnings

26 files changed, 46 insertions, 57 deletions

diff --git a/ext/gl/effects/gstgleffectbulge.c b/ext/gl/effects/gstgleffectbulge.c
index b0c1b4170..a59f276e7 100644
--- a/ext/gl/effects/gstgleffectbulge.c
+++ b/ext/gl/effects/gstgleffectbulge.c
@@ -37,7 +37,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "bulge0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "bulge0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectfisheye.c b/ext/gl/effects/gstgleffectfisheye.c
index 4ee6416e9..80456ff2d 100644
--- a/ext/gl/effects/gstgleffectfisheye.c
+++ b/ext/gl/effects/gstgleffectfisheye.c
@@ -37,7 +37,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "fisheye0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "fisheye0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectglow.c b/ext/gl/effects/gstgleffectglow.c
index b79f54fcf..c3adeebc5 100644
--- a/ext/gl/effects/gstgleffectglow.c
+++ b/ext/gl/effects/gstgleffectglow.c
@@ -40,7 +40,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "glow0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "glow0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -80,7 +80,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "glow1", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "glow1", shader);
   }
 
   if (!kernel_ready) {
@@ -113,7 +113,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }
 
-void
+static void
 gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
     gpointer data)
 {
@@ -127,7 +127,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "glow2", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "glow2", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -155,7 +155,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
   gst_gl_filter_draw_texture (filter, texture, width, height);
 }
 
-void
+static void
 gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
     gpointer data)
 {
@@ -169,7 +169,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "glow3", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "glow3", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectidentity.c b/ext/gl/effects/gstgleffectidentity.c
index 9814fec44..eb17e33e5 100644
--- a/ext/gl/effects/gstgleffectidentity.c
+++ b/ext/gl/effects/gstgleffectidentity.c
@@ -51,7 +51,8 @@ gst_gl_effects_identity_callback (gint width, gint height, guint texture,
 
     if (!shader) {
       shader = gst_gl_shader_new (context);
-      g_hash_table_insert (effects->shaderstable, "identity0", shader);
+      g_hash_table_insert (effects->shaderstable, (gchar *) "identity0",
+          shader);
 
       if (shader) {
         GError *error = NULL;
diff --git a/ext/gl/effects/gstgleffectlumatocurve.c b/ext/gl/effects/gstgleffectlumatocurve.c
index e45a81b14..df888efaf 100644
--- a/ext/gl/effects/gstgleffectlumatocurve.c
+++ b/ext/gl/effects/gstgleffectlumatocurve.c
@@ -38,7 +38,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "lumamap0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "lumamap0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectmirror.c b/ext/gl/effects/gstgleffectmirror.c
index 5d77fa979..5311b53bb 100644
--- a/ext/gl/effects/gstgleffectmirror.c
+++ b/ext/gl/effects/gstgleffectmirror.c
@@ -43,7 +43,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "mirror0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "mirror0", shader);
 
 #if GST_GL_HAVE_GLES2
     if (USING_GLES2 (context)) {
diff --git a/ext/gl/effects/gstgleffectrgbtocurve.c b/ext/gl/effects/gstgleffectrgbtocurve.c
index 293875f77..cac309f53 100644
--- a/ext/gl/effects/gstgleffectrgbtocurve.c
+++ b/ext/gl/effects/gstgleffectrgbtocurve.c
@@ -38,7 +38,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "rgbmap0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "rgbmap0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectsin.c b/ext/gl/effects/gstgleffectsin.c
index 1b229d242..2a6c0514b 100644
--- a/ext/gl/effects/gstgleffectsin.c
+++ b/ext/gl/effects/gstgleffectsin.c
@@ -37,7 +37,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "sin0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "sin0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectsquare.c b/ext/gl/effects/gstgleffectsquare.c
index 127e39ffa..7b4271e33 100644
--- a/ext/gl/effects/gstgleffectsquare.c
+++ b/ext/gl/effects/gstgleffectsquare.c
@@ -37,7 +37,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "square0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "square0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectsqueeze.c b/ext/gl/effects/gstgleffectsqueeze.c
index 14a9bcbc4..e55c4475b 100644
--- a/ext/gl/effects/gstgleffectsqueeze.c
+++ b/ext/gl/effects/gstgleffectsqueeze.c
@@ -43,7 +43,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "squeeze0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "squeeze0", shader);
 
 #if GST_GL_HAVE_GLES2
     if (USING_GLES2 (context)) {
diff --git a/ext/gl/effects/gstgleffectstretch.c b/ext/gl/effects/gstgleffectstretch.c
index 0b8b9d1c6..859f64efd 100644
--- a/ext/gl/effects/gstgleffectstretch.c
+++ b/ext/gl/effects/gstgleffectstretch.c
@@ -37,7 +37,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "stretch0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "stretch0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffecttunnel.c b/ext/gl/effects/gstgleffecttunnel.c
index 21886337e..479434ae1 100644
--- a/ext/gl/effects/gstgleffecttunnel.c
+++ b/ext/gl/effects/gstgleffecttunnel.c
@@ -37,7 +37,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "tunnel0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "tunnel0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffecttwirl.c b/ext/gl/effects/gstgleffecttwirl.c
index 22ce874a7..4a6d7494e 100644
--- a/ext/gl/effects/gstgleffecttwirl.c
+++ b/ext/gl/effects/gstgleffecttwirl.c
@@ -37,7 +37,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (GST_GL_FILTER (effects)->context);
-    g_hash_table_insert (effects->shaderstable, "twirl0", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "twirl0", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/effects/gstgleffectxray.c b/ext/gl/effects/gstgleffectxray.c
index bd70abf8c..d610cc8c8 100644
--- a/ext/gl/effects/gstgleffectxray.c
+++ b/ext/gl/effects/gstgleffectxray.c
@@ -52,7 +52,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray1", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray1", shader);
   }
 
   if (!kernel_ready) {
@@ -99,7 +99,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray2", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray2", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -142,7 +142,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray_desat", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray_desat", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -182,7 +182,8 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray_sob_hconv", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_hconv",
+        shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -224,7 +225,8 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray_sob_vconv", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_vconv",
+        shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -266,7 +268,8 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray_sob_len", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray_sob_len",
+        shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
@@ -295,7 +298,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
 
 /* end of sobel passes */
 
-void
+static void
 gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
     gpointer data)
 {
@@ -309,7 +312,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
 
   if (!shader) {
     shader = gst_gl_shader_new (context);
-    g_hash_table_insert (effects->shaderstable, "xray4", shader);
+    g_hash_table_insert (effects->shaderstable, (gchar *) "xray4", shader);
   }
 
   if (!gst_gl_shader_compile_and_check (shader,
diff --git a/ext/gl/gstgldifferencematte.h b/ext/gl/gstgldifferencematte.h
index a153c3861..0cd122ffb 100644
--- a/ext/gl/gstgldifferencematte.h
+++ b/ext/gl/gstgldifferencematte.h
@@ -56,4 +56,6 @@ struct _GstGLDifferenceMatteClass
   GstGLFilterClass filter_class;
 };
 
+GType gst_gl_differencematte_get_type (void);
+
 #endif /* _GST_GL_DIFFERENCEMATTE_H_ */
diff --git a/ext/gl/gstglfilterapp.h b/ext/gl/gstglfilterapp.h
index f582ae30b..9874d9d5b 100644
--- a/ext/gl/gstglfilterapp.h
+++ b/ext/gl/gstglfilterapp.h
@@ -48,7 +48,7 @@ struct _GstGLFilterAppClass
     GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfilterapp_get_type (void);
+GType gst_gl_filter_app_get_type (void);
 
 G_END_DECLS
 
diff --git a/ext/gl/gstglfilterblur.h b/ext/gl/gstglfilterblur.h
index 5561cb5ae..9604d0572 100644
--- a/ext/gl/gstglfilterblur.h
+++ b/ext/gl/gstglfilterblur.h
@@ -48,6 +48,6 @@ struct _GstGLFilterBlurClass
   GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfilterblur_get_type (void);
+GType gst_gl_filterblur_get_type (void);
 
 #endif /* _GST_GL_FILTERBLUR_H_ */
diff --git a/ext/gl/gstglfiltercube.h b/ext/gl/gstglfiltercube.h
index a72d09ab8..c3e1488cd 100644
--- a/ext/gl/gstglfiltercube.h
+++ b/ext/gl/gstglfiltercube.h
@@ -58,7 +58,7 @@ struct _GstGLFilterCubeClass
     GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfiltercube_get_type (void);
+GType gst_gl_filter_cube_get_type (void);
 
 G_END_DECLS
 
diff --git a/ext/gl/gstglfilterglass.h b/ext/gl/gstglfilterglass.h
index 004885148..3897d0298 100644
--- a/ext/gl/gstglfilterglass.h
+++ b/ext/gl/gstglfilterglass.h
@@ -49,7 +49,7 @@ struct _GstGLFilterGlassClass
   GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfilterglass_get_type (void);
+GType gst_gl_filter_glass_get_type (void);
 
 G_END_DECLS
 
diff --git a/ext/gl/gstglfilterlaplacian.h b/ext/gl/gstglfilterlaplacian.h
index acfa376a8..90a54e3f3 100644
--- a/ext/gl/gstglfilterlaplacian.h
+++ b/ext/gl/gstglfilterlaplacian.h
@@ -46,7 +46,7 @@ struct _GstGLFilterLaplacianClass
   GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfilterlaplacian_get_type (void);
+GType gst_gl_filter_laplacian_get_type (void);
 
 G_END_DECLS
 
diff --git a/ext/gl/gstglfilterreflectedscreen.c b/ext/gl/gstglfilterreflectedscreen.c
index 4934bcacc..c1ef34d3c 100644
--- a/ext/gl/gstglfilterreflectedscreen.c
+++ b/ext/gl/gstglfilterreflectedscreen.c
@@ -334,7 +334,7 @@ gst_gl_filter_reflected_screen_draw_screen (GstGLFilter * filter,
 }
 
 static void
-gst_gl_filter_reflected_screen_draw_background ()
+gst_gl_filter_reflected_screen_draw_background (void)
 {
   glBegin (GL_QUADS);
 
@@ -352,7 +352,7 @@ gst_gl_filter_reflected_screen_draw_background ()
 }
 
 static void
-gst_gl_filter_reflected_screen_draw_floor ()
+gst_gl_filter_reflected_screen_draw_floor (void)
 {
   GLUquadricObj *q;
   //create a quadric for the floor's drawing
diff --git a/ext/gl/gstglfilterreflectedscreen.h b/ext/gl/gstglfilterreflectedscreen.h
index 7f6c5cf10..a739689e4 100644
--- a/ext/gl/gstglfilterreflectedscreen.h
+++ b/ext/gl/gstglfilterreflectedscreen.h
@@ -53,7 +53,7 @@ struct _GstGLFilterReflectedScreenClass
 	GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfilterreflectedscreen_get_type (void);
+GType gst_gl_filter_reflected_screen_get_type (void);
 
 G_END_DECLS
 
diff --git a/ext/gl/gstglfiltershader.h b/ext/gl/gstglfiltershader.h
index 00fa5874c..0d0cce3fc 100644
--- a/ext/gl/gstglfiltershader.h
+++ b/ext/gl/gstglfiltershader.h
@@ -50,6 +50,6 @@ struct _GstGLFilterShaderClass
   GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfiltershader_get_type (void);
+GType gst_gl_filtershader_get_type (void);
 
 #endif /* _GST_GL_FILTERSHADER_H_ */
diff --git a/ext/gl/gstglfiltersobel.h b/ext/gl/gstglfiltersobel.h
index 1a7389163..3b88bafe5 100644
--- a/ext/gl/gstglfiltersobel.h
+++ b/ext/gl/gstglfiltersobel.h
@@ -51,6 +51,6 @@ struct _GstGLFilterSobelClass
   GstGLFilterClass filter_class;
 };
 
-GType gst_gl_glfiltersobel_get_type (void);
+GType gst_gl_filtersobel_get_type (void);
 
 #endif /* _GST_GL_FILTERSOBEL_H_ */
diff --git a/ext/gl/gstgloverlay.h b/ext/gl/gstgloverlay.h
index 6497ec3b8..50e6ef42c 100644
--- a/ext/gl/gstgloverlay.h
+++ b/ext/gl/gstgloverlay.h
@@ -75,6 +75,8 @@ struct _GstGLOverlayClass
   GstGLFilterClass filter_class;
 };
 
+GType gst_gl_overlay_get_type (void);
+
 G_END_DECLS
 
 #endif /* _GST_GL_OVERLAY_H_ */
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index b43985966..ff5e1505e 100644
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -55,42 +55,23 @@
 #include "gstgleffects.h"
 #include "gstglcolorscale.h"
 
-GType gst_gl_filter_cube_get_type (void);
-GType gst_gl_effects_get_type (void);
-
 #if GST_GL_HAVE_OPENGL
 #include "gstgltestsrc.h"
 #include "gstglfilterlaplacian.h"
 #include "gstglfilterglass.h"
 #include "gstglfilterapp.h"
+#include "gstglfilterblur.h"
 #include "gstglfilterreflectedscreen.h"
 #include "gstglfiltershader.h"
+#include "gstglfiltersobel.h"
 #include "gstgldeinterlace.h"
 #include "gstglmosaic.h"
 #include "gstglvideomixer.h"
-
-GType gst_gl_deinterlace_get_type (void);
-GType gst_gl_filter_app_get_type (void);
-GType gst_gl_filter_reflected_screen_get_type (void);
-GType gst_gl_filterblur_get_type (void);
-GType gst_gl_filtershader_get_type (void);
-GType gst_gl_filtersobel_get_type (void);
-GType gst_gl_filter_laplacian_get_type (void);
-GType gst_gl_filter_glass_get_type (void);
-GType gst_gl_mosaic_get_type (void);
-
 #if HAVE_PNG
 #include "gstgldifferencematte.h"
 #include "gstglbumper.h"
-
-GType gst_gl_differencematte_get_type (void);
-GType gst_gl_bumper_get_type (void);
-
 #if HAVE_JPEG
 #include "gstgloverlay.h"
-
-GType gst_gl_overlay_get_type (void);
-
 #endif /* HAVE_JPEG */
 #endif /* HAVE_PNG */
 #endif /* GST_GL_HAVE_OPENGL */