summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2017-03-04 09:09:39 (GMT)
committerSebastian Dröge <sebastian@centricular.com>2017-03-04 09:17:35 (GMT)
commita0199d17a13e2cec35b4d5665b0d53285700bda9 (patch)
tree57e392e412f8e2331be3459beea72a5c0f5e914b
parentc3d21053aa30037cfaea6e3d7c7faa905fb3479f (diff)
downloadgst-plugins-bad-a0199d17a13e2cec35b4d5665b0d53285700bda9.tar.gz
gst-plugins-bad-a0199d17a13e2cec35b4d5665b0d53285700bda9.tar.xz
gl/viv-fb: Don't use deprecated symbols and make macros more consistent
https://bugzilla.gnome.org/show_bug.cgi?id=778825
-rw-r--r--gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.c4
-rw-r--r--gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.c b/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.c
index 6d0598b..f8fb638 100644
--- a/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.c
+++ b/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.c
@@ -30,7 +30,7 @@
#define gst_gl_window_viv_fb_egl_parent_class parent_class
G_DEFINE_TYPE (GstGLWindowVivFBEGL, gst_gl_window_viv_fb_egl,
- GST_GL_TYPE_WINDOW);
+ GST_TYPE_GL_WINDOW);
static guintptr gst_gl_window_viv_fb_egl_get_window_handle (GstGLWindow *
window);
@@ -77,7 +77,7 @@ gst_gl_window_viv_fb_egl_new (GstGLDisplay * display)
/* we require a Vivante FB display to create windows */
return NULL;
- return g_object_new (GST_GL_TYPE_WINDOW_VIV_FB_EGL, NULL);
+ return g_object_new (GST_TYPE_GL_WINDOW_VIV_FB_EGL, NULL);
}
static void
diff --git a/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.h b/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.h
index 5ce15ac..60205e0 100644
--- a/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.h
+++ b/gst-libs/gst/gl/viv-fb/gstglwindow_viv_fb_egl.h
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GST_GL_TYPE_WINDOW_VIV_FB_EGL (gst_gl_window_viv_fb_egl_get_type())
-#define GST_GL_WINDOW_VIV_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGL))
-#define GST_GL_WINDOW_VIV_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGLClass))
-#define GST_GL_IS_WINDOW_VIV_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_VIV_FB_EGL))
-#define GST_GL_IS_WINDOW_VIV_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_VIV_FB_EGL))
-#define GST_GL_WINDOW_VIV_FB_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGL_Class))
+#define GST_TYPE_GL_WINDOW_VIV_FB_EGL (gst_gl_window_viv_fb_egl_get_type())
+#define GST_GL_WINDOW_VIV_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGL))
+#define GST_GL_WINDOW_VIV_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_TYPE_GL_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGLClass))
+#define GST_IS_GL_WINDOW_VIV_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_WINDOW_VIV_FB_EGL))
+#define GST_IS_GL_WINDOW_VIV_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_TYPE_GL_WINDOW_VIV_FB_EGL))
+#define GST_GL_WINDOW_VIV_FB_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_TYPE_GL_WINDOW_VIV_FB_EGL, GstGLWindowVivFBEGL_Class))
typedef struct _GstGLWindowVivFBEGL GstGLWindowVivFBEGL;
typedef struct _GstGLWindowVivFBEGLClass GstGLWindowVivFBEGLClass;