diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2015-04-26 21:39:06 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-04-26 21:39:06 +0200 |
commit | c638477c48793de9829a1fa92c6828b5b54a7f74 (patch) | |
tree | 98a4555d02287d1256f09c19e2a038e4ccf444c1 /gst-libs | |
parent | 51daa8b9e2b351055ce59ed89b0417ff9f7dccb9 (diff) | |
download | gstreamer-plugins-bad-c638477c48793de9829a1fa92c6828b5b54a7f74.tar.gz |
glfilter: Remove onStart/onStop vfuncs, and unused onReset()
onStart/onStop are just duplicates of the basetransform ones, onReset
was never called but was used everywhere when stop should've been used.
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/gl/gstglfilter.c | 18 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglfilter.h | 6 |
2 files changed, 0 insertions, 24 deletions
diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index cf95d1cbb..b7791e907 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -75,7 +75,6 @@ static GstCaps *gst_gl_filter_transform_caps (GstBaseTransform * bt, static GstCaps *gst_gl_filter_fixate_caps (GstBaseTransform * bt, GstPadDirection direction, GstCaps * caps, GstCaps * othercaps); static void gst_gl_filter_reset (GstGLFilter * filter); -static gboolean gst_gl_filter_start (GstBaseTransform * bt); static gboolean gst_gl_filter_stop (GstBaseTransform * bt); static gboolean gst_gl_filter_get_unit_size (GstBaseTransform * trans, GstCaps * caps, gsize * size); @@ -106,7 +105,6 @@ gst_gl_filter_class_init (GstGLFilterClass * klass) gst_gl_filter_transform_caps; GST_BASE_TRANSFORM_CLASS (klass)->fixate_caps = gst_gl_filter_fixate_caps; GST_BASE_TRANSFORM_CLASS (klass)->transform = gst_gl_filter_transform; - GST_BASE_TRANSFORM_CLASS (klass)->start = gst_gl_filter_start; GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_filter_stop; GST_BASE_TRANSFORM_CLASS (klass)->set_caps = gst_gl_filter_set_caps; GST_BASE_TRANSFORM_CLASS (klass)->propose_allocation = @@ -165,25 +163,9 @@ gst_gl_filter_reset (GstGLFilter * filter) } static gboolean -gst_gl_filter_start (GstBaseTransform * bt) -{ - GstGLFilter *filter = GST_GL_FILTER (bt); - GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter); - - if (filter_class->onStart) - filter_class->onStart (filter); - - return GST_BASE_TRANSFORM_CLASS (parent_class)->start (bt); -} - -static gboolean gst_gl_filter_stop (GstBaseTransform * bt) { GstGLFilter *filter = GST_GL_FILTER (bt); - GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter); - - if (filter_class->onStop) - filter_class->onStop (filter); gst_gl_filter_reset (filter); diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h index fcca30852..55a522da5 100644 --- a/gst-libs/gst/gl/gstglfilter.h +++ b/gst-libs/gst/gl/gstglfilter.h @@ -91,8 +91,6 @@ struct _GstGLFilter * @filter_texture: given @in_tex, transform it into @out_tex. Not used * if @filter exists * @onInitFBO: perform initialization when the Framebuffer object is created - * @onStart: called when element activates see also #GstBaseTransform - * @onStop: called when the element deactivates e also #GstBaseTransform * @onReset: called on inizialation and after @onStop * @display_init_cb: execute arbitrary gl code on start * @display_reset_cb: execute arbitrary gl code at stop @@ -106,10 +104,6 @@ struct _GstGLFilterClass gboolean (*filter_texture) (GstGLFilter *filter, guint in_tex, guint out_tex); gboolean (*onInitFBO) (GstGLFilter *filter); - void (*onStart) (GstGLFilter *filter); - void (*onStop) (GstGLFilter *filter); - void (*onReset) (GstGLFilter *filter); - /* useful to init and cleanup custom gl resources */ void (*display_init_cb) (GstGLFilter *filter); void (*display_reset_cb) (GstGLFilter *filter); |