mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-13 01:35:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: GST_GL_TYPE -> GST_TYPE_GL

Browse source 
Some deprecated symbols are kept for backwards compatibility
This commit is contained in:
Matthew Waters 2016-10-05 12:19:12 +11:00
parent 4f537c636a
commit d0a9cc0abc
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/gl/gstglbasemixer.c
View file

@ -157,7 +157,7 @@ _find_local_gl_context (GstGLBaseMixer * mix)
gst_query_parse_context (query, &context); gst_query_parse_context (query, &context);
if (context) { if (context) {
s = gst_context_get_structure (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); NULL);
} }
} }
@ -166,7 +166,7 @@ _find_local_gl_context (GstGLBaseMixer * mix)
gst_query_parse_context (query, &context); gst_query_parse_context (query, &context);
if (context) { if (context) {
s = gst_context_get_structure (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); NULL);
} }
} }
@ -317,7 +317,7 @@ gst_gl_base_mixer_sink_query (GstAggregator * agg, GstAggregatorPad * bpad,
context = gst_context_new ("gst.gl.local_context", FALSE); context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context); 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); NULL);
gst_query_set_context (query, context); gst_query_set_context (query, context);
gst_context_unref (context); gst_context_unref (context);
@ -416,7 +416,7 @@ gst_gl_base_mixer_class_init (GstGLBaseMixerClass * klass)
g_param_spec_object ("context", g_param_spec_object ("context",
"OpenGL context", "OpenGL context",
"Get 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 */ /* Register the pad class */
g_type_class_ref (GST_TYPE_GL_BASE_MIXER_PAD); 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); context = gst_context_new ("gst.gl.local_context", FALSE);
s = gst_context_writable_structure (context); 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); NULL);
gst_query_set_context (query, context); gst_query_set_context (query, context);
gst_context_unref (context); gst_context_unref (context);

6
ext/gl/gstglvideomixer.c
View file

@ -51,7 +51,7 @@
#define GST_CAT_DEFAULT gst_gl_video_mixer_debug #define GST_CAT_DEFAULT gst_gl_video_mixer_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); 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 static GType
gst_gl_video_mixer_background_get_type (void) 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_object_class_install_property (gobject_class, PROP_BIN_BACKGROUND,
g_param_spec_enum ("background", "Background", "Background type", 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)); DEFAULT_BACKGROUND, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_set_metadata (element_class, "OpenGL video_mixer bin", 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_object_class_install_property (gobject_class, PROP_BACKGROUND,
g_param_spec_enum ("background", "Background", "Background type", 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)); DEFAULT_BACKGROUND, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader; GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader;