diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2017-03-04 11:15:58 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2017-03-04 11:17:35 +0200 |
commit | 296b4251e3042fe95a9cce1ad7674b708ba92599 (patch) | |
tree | 4750d645ed97278de73f8999f9cc75c8d5155e17 /gst-libs | |
parent | a0199d17a13e2cec35b4d5665b0d53285700bda9 (diff) | |
download | gstreamer-plugins-bad-296b4251e3042fe95a9cce1ad7674b708ba92599.tar.gz |
gl: Fix backwards compat GST_GL_TYPE_* functions/macros
These have to be macros instead of inline function as they must behave
more or less like an integer literal, i.e. include the function call.
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h | 5 | ||||
-rw-r--r-- | gst-libs/gst/gl/egl/gstglcontext_egl.h | 5 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglcontext.h | 5 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglshader.h | 5 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglwindow.h | 5 | ||||
-rw-r--r-- | gst-libs/gst/gl/x11/gstglcontext_glx.h | 5 |
6 files changed, 18 insertions, 12 deletions
diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h index 193e95edd..b767bb3ba 100644 --- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h +++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.h @@ -31,8 +31,9 @@ G_BEGIN_DECLS GType gst_gl_context_cocoa_get_type (void); /* FIXME: remove this when moving to -base */ -G_DEPRECATED_FOR(GST_TYPE_GL_CONTEXT_COCOA) \ -static inline GType GST_GL_TYPE_CONTEXT_COCOA (void) { return GST_TYPE_GL_CONTEXT_COCOA; } +#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 4e899ffb8..1923664d0 100644 --- a/gst-libs/gst/gl/egl/gstglcontext_egl.h +++ b/gst-libs/gst/gl/egl/gstglcontext_egl.h @@ -36,8 +36,9 @@ 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 */ -G_DEPRECATED_FOR(GST_TYPE_GL_CONTEXT_EGL) \ -static inline GType GST_GL_TYPE_CONTEXT_EGL (void) { return GST_TYPE_GL_CONTEXT_EGL; } +#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/gstglcontext.h b/gst-libs/gst/gl/gstglcontext.h index 9aa3d1401..55947f698 100644 --- a/gst-libs/gst/gl/gstglcontext.h +++ b/gst-libs/gst/gl/gstglcontext.h @@ -32,8 +32,9 @@ GType gst_gl_context_get_type (void); #define GST_TYPE_GL_CONTEXT (gst_gl_context_get_type()) /* FIXME: remove this when moving to -base */ -G_DEPRECATED_FOR(GST_TYPE_GL_CONTEXT) \ -static inline GType GST_GL_TYPE_CONTEXT (void) { return GST_TYPE_GL_CONTEXT; } +#ifndef GST_DISABLE_DEPRECATED +#define GST_TYPE_GL_CONTEXT GST_TYPE_GL_CONTEXT +#endif #define GST_GL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_GL_CONTEXT, GstGLContext)) #define GST_GL_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GST_TYPE_GL_CONTEXT, GstGLContextClass)) #define GST_IS_GL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_GL_CONTEXT)) diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h index cce614dec..69cd7a23a 100644 --- a/gst-libs/gst/gl/gstglshader.h +++ b/gst-libs/gst/gl/gstglshader.h @@ -31,8 +31,9 @@ GType gst_gl_shader_get_type (void); #define GST_TYPE_GL_SHADER (gst_gl_shader_get_type()) /* FIXME: remove this when moving to -base */ -G_DEPRECATED_FOR(GST_TYPE_GL_SHADER) \ -static inline GType GST_GL_TYPE_SHADER (void) { return GST_TYPE_GL_SHADER; } +#ifndef GST_DISABLE_DEPRECATED +#define GST_TYPE_GL_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 d6f65d4cc..baa49f169 100644 --- a/gst-libs/gst/gl/gstglwindow.h +++ b/gst-libs/gst/gl/gstglwindow.h @@ -35,8 +35,9 @@ GType gst_gl_window_get_type (void); #define GST_TYPE_GL_WINDOW (gst_gl_window_get_type()) /* FIXME: remove this when moving to -base */ -G_DEPRECATED_FOR(GST_TYPE_GL_WINDOW) \ -static inline GType GST_GL_TYPE_WINDOW (void) { return GST_TYPE_GL_WINDOW; } +#ifndef GST_DISABLE_DEPRECATED +#define GST_TYPE_GL_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 8b7f0dedc..1df94a63a 100644 --- a/gst-libs/gst/gl/x11/gstglcontext_glx.h +++ b/gst-libs/gst/gl/x11/gstglcontext_glx.h @@ -31,8 +31,9 @@ G_BEGIN_DECLS GType gst_gl_context_glx_get_type (void); /* FIXME: remove this when moving to -base */ -G_DEPRECATED_FOR(GST_TYPE_GL_CONTEXT_GLX) \ -static inline GType GST_GL_TYPE_CONTEXT_GLX (void) { return GST_TYPE_GL_CONTEXT_GLX; } +#ifndef GST_DISABLE_DEPRECATED +#define GST_TYPE_GL_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)) |