diff --git a/gst/gl/gstglfilterblur.c b/gst/gl/gstglfilterblur.c index 2feb08e85e..977500205a 100644 --- a/gst/gl/gstglfilterblur.c +++ b/gst/gl/gstglfilterblur.c @@ -22,7 +22,31 @@ #include "config.h" #endif -#include "gstglfilterblur.h" +#include + +#define GST_TYPE_GL_FILTERBLUR (gst_gl_filterblur_get_type()) +#define GST_GL_FILTERBLUR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_FILTERBLUR,GstGLFilterBlur)) +#define GST_IS_GL_FILTERBLUR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GL_FILTERBLUR)) +#define GST_GL_FILTERBLUR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_GL_FILTERBLUR,GstGLFilterBlurClass)) +#define GST_IS_GL_FILTERBLUR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_GL_FILTERBLUR)) +#define GST_GL_FILTERBLUR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_GL_FILTERBLUR,GstGLFilterBlurClass)) + +typedef struct _GstGLFilterBlur GstGLFilterBlur; +typedef struct _GstGLFilterBlurClass GstGLFilterBlurClass; + +struct _GstGLFilterBlur +{ + GstGLFilter filter; + GstGLShader *shader0; + GstGLShader *shader1; +}; + +struct _GstGLFilterBlurClass +{ + GstGLFilterClass filter_class; +}; + +GType gst_gl_glfilterblur_get_type (void); /* horizontal convolution */ static const gchar *hconv9_fragment_source = diff --git a/gst/gl/gstglfilterblur.h b/gst/gl/gstglfilterblur.h deleted file mode 100644 index 2e0c70fcd4..0000000000 --- a/gst/gl/gstglfilterblur.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2008 Filippo Argiolas - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef _GST_GL_FILTERBLUR_H_ -#define _GST_GL_FILTERBLUR_H_ - -#include - -G_BEGIN_DECLS - -#define GST_TYPE_GL_FILTERBLUR (gst_gl_filterblur_get_type()) -#define GST_GL_FILTERBLUR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_FILTERBLUR,GstGLFilterBlur)) -#define GST_IS_GL_FILTERBLUR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GL_FILTERBLUR)) -#define GST_GL_FILTERBLUR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_GL_FILTERBLUR,GstGLFilterBlurClass)) -#define GST_IS_GL_FILTERBLUR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_GL_FILTERBLUR)) -#define GST_GL_FILTERBLUR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_GL_FILTERBLUR,GstGLFilterBlurClass)) - -typedef struct _GstGLFilterBlur GstGLFilterBlur; -typedef struct _GstGLFilterBlurClass GstGLFilterBlurClass; - -struct _GstGLFilterBlur -{ - GstGLFilter filter; - GstGLShader *shader0; - GstGLShader *shader1; -}; - -struct _GstGLFilterBlurClass -{ - GstGLFilterClass filter_class; -}; - -GType gst_gl_glfilterblur_get_type (void); - -G_END_DECLS - -#endif /* _GST_GLFILTERBLUR_H_ */ diff --git a/gst/gl/gstopengl.c b/gst/gl/gstopengl.c index 1de31b19f0..e64b66eef6 100644 --- a/gst/gl/gstopengl.c +++ b/gst/gl/gstopengl.c @@ -26,7 +26,6 @@ #include "gstglupload.h" #include "gstglfiltercube.h" #include "gstglfilteredge.h" -#include "gstglfilterblur.h" #include "gstglfilterlaplacian.h" #include "gstglfilterapp.h" #include "gstgldownload.h" @@ -64,7 +63,7 @@ plugin_init (GstPlugin * plugin) } if (!gst_element_register (plugin, "glfilterblur", - GST_RANK_NONE, GST_TYPE_GL_FILTERBLUR)) { + GST_RANK_NONE, gst_gl_filterblur_get_type())) { return FALSE; }