From d0a9cc0abcb52941daed1af1bf475ce231526cfc Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Wed, 5 Oct 2016 12:19:12 +1100
Subject: [PATCH] gl: GST_GL_TYPE -> GST_TYPE_GL
Some deprecated symbols are kept for backwards compatibility
---
ext/gl/gstglbasemixer.c | 10 +++++-----
ext/gl/gstglvideomixer.c | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ext/gl/gstglbasemixer.c b/ext/gl/gstglbasemixer.c
index 410a42022a..2611f3d9a9 100644
--- a/ext/gl/gstglbasemixer.c
+++ b/ext/gl/gstglbasemixer.c
@@ -157,7 +157,7 @@ _find_local_gl_context (GstGLBaseMixer * mix)
gst_query_parse_context (query, &context);
if (context) {
s = gst_context_get_structure (context);
- gst_structure_get (s, "context", GST_GL_TYPE_CONTEXT, &mix->context,
+ gst_structure_get (s, "context", GST_TYPE_GL_CONTEXT, &mix->context,
NULL);
}
}
@@ -166,7 +166,7 @@ _find_local_gl_context (GstGLBaseMixer * mix)
gst_query_parse_context (query, &context);
if (context) {
s = gst_context_get_structure (context);
- gst_structure_get (s, "context", GST_GL_TYPE_CONTEXT, &mix->context,
+ gst_structure_get (s, "context", GST_TYPE_GL_CONTEXT, &mix->context,
NULL);
}
}
@@ -317,7 +317,7 @@ gst_gl_base_mixer_sink_query (GstAggregator * agg, GstAggregatorPad * bpad,
context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context);
- gst_structure_set (s, "context", GST_GL_TYPE_CONTEXT, mix->context,
+ gst_structure_set (s, "context", GST_TYPE_GL_CONTEXT, mix->context,
NULL);
gst_query_set_context (query, context);
gst_context_unref (context);
@@ -416,7 +416,7 @@ gst_gl_base_mixer_class_init (GstGLBaseMixerClass * klass)
g_param_spec_object ("context",
"OpenGL context",
"Get OpenGL context",
- GST_GL_TYPE_CONTEXT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+ GST_TYPE_GL_CONTEXT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/* Register the pad class */
g_type_class_ref (GST_TYPE_GL_BASE_MIXER_PAD);
@@ -536,7 +536,7 @@ gst_gl_base_mixer_src_query (GstAggregator * agg, GstQuery * query)
context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context);
- gst_structure_set (s, "context", GST_GL_TYPE_CONTEXT, mix->context,
+ gst_structure_set (s, "context", GST_TYPE_GL_CONTEXT, mix->context,
NULL);
gst_query_set_context (query, context);
gst_context_unref (context);
diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index 04fab6f907..47d039678d 100644
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -51,7 +51,7 @@
#define GST_CAT_DEFAULT gst_gl_video_mixer_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
-#define GST_GL_TYPE_VIDEO_MIXER_BACKGROUND (gst_gl_video_mixer_background_get_type())
+#define GST_TYPE_GL_VIDEO_MIXER_BACKGROUND (gst_gl_video_mixer_background_get_type())
static GType
gst_gl_video_mixer_background_get_type (void)
{
@@ -417,7 +417,7 @@ gst_gl_video_mixer_bin_class_init (GstGLVideoMixerBinClass * klass)
g_object_class_install_property (gobject_class, PROP_BIN_BACKGROUND,
g_param_spec_enum ("background", "Background", "Background type",
- GST_GL_TYPE_VIDEO_MIXER_BACKGROUND,
+ GST_TYPE_GL_VIDEO_MIXER_BACKGROUND,
DEFAULT_BACKGROUND, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_set_metadata (element_class, "OpenGL video_mixer bin",
@@ -875,7 +875,7 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass)
g_object_class_install_property (gobject_class, PROP_BACKGROUND,
g_param_spec_enum ("background", "Background", "Background type",
- GST_GL_TYPE_VIDEO_MIXER_BACKGROUND,
+ GST_TYPE_GL_VIDEO_MIXER_BACKGROUND,
DEFAULT_BACKGROUND, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader;