diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-02-08 21:14:56 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2018-02-08 21:14:56 +1100 |
| commit | bc604f35978227c8885665c4a44d7a54665b70a2 (patch) | |
| tree | 3df47c7ac314229e9740a8346669c6f5e42b1c77 | |
| parent | 54701ceb4041b81f7c3074bad2c62b69a7c9ed80 (diff) | |
gl: remove more deprecated type aliases
Additions on top of
https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=32a17f313494cbadaf8ec4e337d742e8d7e1b67b
https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=c8b99139b1ef3f8891548b0f2607a135917c338e
| -rw-r--r-- | gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gl/egl/gstglcontext_egl.h | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglshader.h | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglwindow.h | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gl/x11/gstglcontext_glx.h | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h index b767bb3ba..e34e449ee 100644 --- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h +++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h @@ -30,10 +30,6 @@ G_BEGIN_DECLS #define GST_TYPE_GL_CONTEXT_COCOA (gst_gl_context_cocoa_get_type()) GType gst_gl_context_cocoa_get_type (void); -/* FIXME: remove this when moving to -base */ -#ifndef GST_DISABLE_DEPRECATED -#define GST_GL_TYPE_CONTEXT_COCOA GST_TYPE_GL_CONTEXT_COCOA -#endif #define GST_GL_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_CONTEXT_COCOA, GstGLContextCocoa)) #define GST_GL_CONTEXT_COCOA_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_TYPE_GL_CONTEXT_COCOA, GstGLContextCocoaClass)) #define GST_IS_GL_CONTEXT_COCOA(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_CONTEXT_COCOA)) diff --git a/gst-libs/gst/gl/egl/gstglcontext_egl.h b/gst-libs/gst/gl/egl/gstglcontext_egl.h index 67947a885..1703e9e7b 100644 --- a/gst-libs/gst/gl/egl/gstglcontext_egl.h +++ b/gst-libs/gst/gl/egl/gstglcontext_egl.h @@ -32,10 +32,6 @@ typedef struct _GstGLContextEGLClass GstGLContextEGLClass; G_GNUC_INTERNAL GType gst_gl_context_egl_get_type (void); #define GST_TYPE_GL_CONTEXT_EGL (gst_gl_context_egl_get_type()) -/* FIXME: remove this when moving to -base */ -#ifndef GST_DISABLE_DEPRECATED -#define GST_GL_TYPE_CONTEXT_EGL GST_TYPE_GL_CONTEXT_EGL -#endif #define GST_GL_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_CONTEXT_EGL, GstGLContextEGL)) #define GST_GL_CONTEXT_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_TYPE_GL_CONTEXT_EGL, GstGLContextEGLClass)) #define GST_IS_GL_CONTEXT_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_CONTEXT_EGL)) diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index c3bc57cb0..9441001d6 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -30,10 +30,6 @@ GST_EXPORT GType gst_gl_shader_get_type (void); #define GST_TYPE_GL_SHADER (gst_gl_shader_get_type()) -/* FIXME: remove this when moving to -base */ -#ifndef GST_DISABLE_DEPRECATED -#define GST_GL_TYPE_SHADER GST_TYPE_GL_SHADER -#endif #define GST_GL_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_SHADER, GstGLShader)) #define GST_GL_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_TYPE_GL_SHADER, GstGLShaderClass)) #define GST_IS_GL_SHADER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_SHADER)) diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h index d943b795f..83e6a98c6 100644 --- a/gst-libs/gst/gl/gstglwindow.h +++ b/gst-libs/gst/gl/gstglwindow.h @@ -34,10 +34,6 @@ GST_EXPORT GType gst_gl_window_get_type (void); #define GST_TYPE_GL_WINDOW (gst_gl_window_get_type()) -/* FIXME: remove this when moving to -base */ -#ifndef GST_DISABLE_DEPRECATED -#define GST_GL_TYPE_WINDOW GST_TYPE_GL_WINDOW -#endif #define GST_GL_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_WINDOW, GstGLWindow)) #define GST_GL_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_TYPE_GL_WINDOW, GstGLWindowClass)) #define GST_IS_GL_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_WINDOW)) diff --git a/gst-libs/gst/gl/x11/gstglcontext_glx.h b/gst-libs/gst/gl/x11/gstglcontext_glx.h index e3eb8fe3c..40886ed29 100644 --- a/gst-libs/gst/gl/x11/gstglcontext_glx.h +++ b/gst-libs/gst/gl/x11/gstglcontext_glx.h @@ -30,10 +30,6 @@ G_BEGIN_DECLS #define GST_TYPE_GL_CONTEXT_GLX (gst_gl_context_glx_get_type()) G_GNUC_INTERNAL GType gst_gl_context_glx_get_type (void); -/* FIXME: remove this when moving to -base */ -#ifndef GST_DISABLE_DEPRECATED -#define GST_GL_TYPE_CONTEXT_GLX GST_TYPE_GL_CONTEXT_GLX -#endif #define GST_GL_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_CONTEXT_GLX, GstGLContextGLX)) #define GST_GL_CONTEXT_GLX_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_TYPE_GL_CONTEXT_GLX, GstGLContextGLXClass)) #define GST_IS_GL_CONTEXT_GLX(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_CONTEXT_GLX)) |