diff options
Diffstat (limited to 'gst')
-rw-r--r-- | gst/geometrictransform/gstbulge.c | 14 | ||||
-rw-r--r-- | gst/geometrictransform/gstcircle.c | 12 | ||||
-rw-r--r-- | gst/geometrictransform/gstcirclegeometrictransform.c | 16 | ||||
-rw-r--r-- | gst/geometrictransform/gstdiffuse.c | 6 | ||||
-rw-r--r-- | gst/geometrictransform/gstgeometrictransform.c | 6 | ||||
-rw-r--r-- | gst/geometrictransform/gstkaleidoscope.c | 15 | ||||
-rw-r--r-- | gst/geometrictransform/gstmarble.c | 6 | ||||
-rw-r--r-- | gst/geometrictransform/gstperspective.c | 14 | ||||
-rw-r--r-- | gst/geometrictransform/gstpinch.c | 12 | ||||
-rw-r--r-- | gst/geometrictransform/gstrotate.c | 12 | ||||
-rw-r--r-- | gst/geometrictransform/gstsphere.c | 12 | ||||
-rw-r--r-- | gst/geometrictransform/gstsquare.c | 4 | ||||
-rw-r--r-- | gst/geometrictransform/gststretch.c | 13 | ||||
-rw-r--r-- | gst/geometrictransform/gsttunnel.c | 11 | ||||
-rw-r--r-- | gst/geometrictransform/gsttwirl.c | 12 | ||||
-rw-r--r-- | gst/geometrictransform/gstwaterripple.c | 14 |
16 files changed, 32 insertions, 147 deletions
diff --git a/gst/geometrictransform/gstbulge.c b/gst/geometrictransform/gstbulge.c index 7ef8f296a..5dbc63a29 100644 --- a/gst/geometrictransform/gstbulge.c +++ b/gst/geometrictransform/gstbulge.c @@ -110,13 +110,6 @@ gst_bulge_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_bulge_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean bulge_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -182,9 +175,8 @@ gst_bulge_class_init (GstBulgeClass * klass) "Adds a protuberance in the center point", "Filippo Argiolas <filippo.argiolas@gmail.com>"); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_bulge_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_bulge_get_property); - + gobject_class->set_property = gst_bulge_set_property; + gobject_class->get_property = gst_bulge_get_property; g_object_class_install_property (gobject_class, PROP_ZOOM, g_param_spec_double ("zoom", "zoom", @@ -192,8 +184,6 @@ gst_bulge_class_init (GstBulgeClass * klass) 1.0, 100.0, DEFAULT_ZOOM, GST_PARAM_CONTROLLABLE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_bulge_finalize); - gstgt_class->map_func = bulge_map; } diff --git a/gst/geometrictransform/gstcircle.c b/gst/geometrictransform/gstcircle.c index 6f9340d0c..d40afac16 100644 --- a/gst/geometrictransform/gstcircle.c +++ b/gst/geometrictransform/gstcircle.c @@ -143,13 +143,6 @@ gst_circle_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_circle_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean circle_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -197,9 +190,8 @@ gst_circle_class_init (GstCircleClass * klass) "Warps the picture into an arc shaped form", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_circle_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_circle_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_circle_get_property); + gobject_class->set_property = gst_circle_set_property; + gobject_class->get_property = gst_circle_get_property; g_object_class_install_property (gobject_class, PROP_ANGLE, g_param_spec_double ("angle", "angle", diff --git a/gst/geometrictransform/gstcirclegeometrictransform.c b/gst/geometrictransform/gstcirclegeometrictransform.c index 9545707e5..d77abbd4f 100644 --- a/gst/geometrictransform/gstcirclegeometrictransform.c +++ b/gst/geometrictransform/gstcirclegeometrictransform.c @@ -139,13 +139,6 @@ gst_circle_geometric_transform_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_circle_geometric_transform_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - /* GObject vmethod implementations */ static gboolean @@ -175,13 +168,8 @@ gst_circle_geometric_transform_class_init (GstCircleGeometricTransformClass * parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = - GST_DEBUG_FUNCPTR (gst_circle_geometric_transform_finalize); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_circle_geometric_transform_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_circle_geometric_transform_get_property); - + gobject_class->set_property = gst_circle_geometric_transform_set_property; + gobject_class->get_property = gst_circle_geometric_transform_get_property; /* FIXME I don't like the idea of x-center and y-center being in % and * radius and intensity in absolute values, I think no one likes it, but diff --git a/gst/geometrictransform/gstdiffuse.c b/gst/geometrictransform/gstdiffuse.c index f08fb25f8..54c759da7 100644 --- a/gst/geometrictransform/gstdiffuse.c +++ b/gst/geometrictransform/gstdiffuse.c @@ -190,9 +190,9 @@ gst_diffuse_class_init (GstDiffuseClass * klass) "Diffuses the image by moving its pixels in random directions", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_diffuse_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_diffuse_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_diffuse_get_property); + gobject_class->finalize = gst_diffuse_finalize; + gobject_class->set_property = gst_diffuse_set_property; + gobject_class->get_property = gst_diffuse_get_property; g_object_class_install_property (gobject_class, PROP_SCALE, g_param_spec_double ("scale", "scale", diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c index 4c08b20ea..a2377344e 100644 --- a/gst/geometrictransform/gstgeometrictransform.c +++ b/gst/geometrictransform/gstgeometrictransform.c @@ -371,10 +371,8 @@ gst_geometric_transform_class_init (gpointer klass, gpointer class_data) parent_class = g_type_class_peek_parent (klass); - obj_class->set_property = - GST_DEBUG_FUNCPTR (gst_geometric_transform_set_property); - obj_class->get_property = - GST_DEBUG_FUNCPTR (gst_geometric_transform_get_property); + obj_class->set_property = gst_geometric_transform_set_property; + obj_class->get_property = gst_geometric_transform_get_property; trans_class->stop = GST_DEBUG_FUNCPTR (gst_geometric_transform_stop); trans_class->before_transform = diff --git a/gst/geometrictransform/gstkaleidoscope.c b/gst/geometrictransform/gstkaleidoscope.c index 29bc1f967..ee85e0ffc 100644 --- a/gst/geometrictransform/gstkaleidoscope.c +++ b/gst/geometrictransform/gstkaleidoscope.c @@ -143,13 +143,6 @@ gst_kaleidoscope_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_kaleidoscope_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean kaleidoscope_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -202,12 +195,8 @@ gst_kaleidoscope_class_init (GstKaleidoscopeClass * klass) "Applies 'kaleidoscope' geometric transform to the image", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_kaleidoscope_finalize); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_kaleidoscope_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_kaleidoscope_get_property); - + gobject_class->set_property = gst_kaleidoscope_set_property; + gobject_class->get_property = gst_kaleidoscope_get_property; g_object_class_install_property (gobject_class, PROP_ANGLE, g_param_spec_double ("angle", "angle", diff --git a/gst/geometrictransform/gstmarble.c b/gst/geometrictransform/gstmarble.c index 7d768bda6..44883c25b 100644 --- a/gst/geometrictransform/gstmarble.c +++ b/gst/geometrictransform/gstmarble.c @@ -229,9 +229,9 @@ gst_marble_class_init (GstMarbleClass * klass) "Applies a marbling effect to the image", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_marble_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_marble_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_marble_get_property); + gobject_class->finalize = gst_marble_finalize; + gobject_class->set_property = gst_marble_set_property; + gobject_class->get_property = gst_marble_get_property; g_object_class_install_property (gobject_class, PROP_XSCALE, g_param_spec_double ("x-scale", "x-scale", diff --git a/gst/geometrictransform/gstperspective.c b/gst/geometrictransform/gstperspective.c index 94b271ea2..79dd4f4ab 100644 --- a/gst/geometrictransform/gstperspective.c +++ b/gst/geometrictransform/gstperspective.c @@ -161,13 +161,6 @@ gst_perspective_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_perspective_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean perspective_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -216,11 +209,8 @@ gst_perspective_class_init (GstPerspectiveClass * klass) "Apply a 2D perspective transform", "Antonio Ospite <ospite@studenti.unina.it>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_perspective_finalize); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_perspective_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_perspective_get_property); + gobject_class->set_property = gst_perspective_set_property; + gobject_class->get_property = gst_perspective_get_property; g_object_class_install_property (gobject_class, PROP_MATRIX, g_param_spec_value_array ("matrix", diff --git a/gst/geometrictransform/gstpinch.c b/gst/geometrictransform/gstpinch.c index 98fff5ff0..1e6998320 100644 --- a/gst/geometrictransform/gstpinch.c +++ b/gst/geometrictransform/gstpinch.c @@ -116,13 +116,6 @@ gst_pinch_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_pinch_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean pinch_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -183,9 +176,8 @@ gst_pinch_class_init (GstPinchClass * klass) "Applies 'pinch' geometric transform to the image", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_pinch_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_pinch_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_pinch_get_property); + gobject_class->set_property = gst_pinch_set_property; + gobject_class->get_property = gst_pinch_get_property; g_object_class_install_property (gobject_class, PROP_INTENSITY, diff --git a/gst/geometrictransform/gstrotate.c b/gst/geometrictransform/gstrotate.c index b48747986..5d07d173b 100644 --- a/gst/geometrictransform/gstrotate.c +++ b/gst/geometrictransform/gstrotate.c @@ -117,13 +117,6 @@ gst_rotate_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_rotate_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean rotate_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -191,9 +184,8 @@ gst_rotate_class_init (GstRotateClass * klass) "Rotates the picture by an arbitrary angle", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_rotate_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_rotate_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_rotate_get_property); + gobject_class->set_property = gst_rotate_set_property; + gobject_class->get_property = gst_rotate_get_property; g_object_class_install_property (gobject_class, PROP_ANGLE, g_param_spec_double ("angle", "angle", diff --git a/gst/geometrictransform/gstsphere.c b/gst/geometrictransform/gstsphere.c index 77b14bf69..39683eea0 100644 --- a/gst/geometrictransform/gstsphere.c +++ b/gst/geometrictransform/gstsphere.c @@ -116,13 +116,6 @@ gst_sphere_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_sphere_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - /* TODO we could have horizontal and vertical 'radius' */ static gboolean sphere_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, @@ -195,9 +188,8 @@ gst_sphere_class_init (GstSphereClass * klass) "Applies 'sphere' geometric transform to the image", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_sphere_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_sphere_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_sphere_get_property); + gobject_class->set_property = gst_sphere_set_property; + gobject_class->get_property = gst_sphere_get_property; g_object_class_install_property (gobject_class, PROP_REFRACTION, g_param_spec_double ("refraction", "refraction", diff --git a/gst/geometrictransform/gstsquare.c b/gst/geometrictransform/gstsquare.c index c0eebdac1..960b93a04 100644 --- a/gst/geometrictransform/gstsquare.c +++ b/gst/geometrictransform/gstsquare.c @@ -193,8 +193,8 @@ gst_square_class_init (GstSquareClass * klass) "Distort center part of the image into a square", "Filippo Argiolas <filippo.argiolas@gmail.com>"); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_square_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_square_get_property); + gobject_class->set_property = gst_square_set_property; + gobject_class->get_property = gst_square_get_property; g_object_class_install_property (gobject_class, PROP_WIDTH, g_param_spec_double ("width", "Width", diff --git a/gst/geometrictransform/gststretch.c b/gst/geometrictransform/gststretch.c index 6b96830c7..0dc705f71 100644 --- a/gst/geometrictransform/gststretch.c +++ b/gst/geometrictransform/gststretch.c @@ -111,13 +111,6 @@ gst_stretch_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_stretch_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean stretch_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -184,8 +177,8 @@ gst_stretch_class_init (GstStretchClass * klass) "Stretch the image in a circle around the center point", "Filippo Argiolas <filippo.argiolas@gmail.com>"); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_stretch_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_stretch_get_property); + gobject_class->set_property = gst_stretch_set_property; + gobject_class->get_property = gst_stretch_get_property; g_object_class_install_property (gobject_class, PROP_INTENSITY, @@ -194,8 +187,6 @@ gst_stretch_class_init (GstStretchClass * klass) 0.0, 1.0, DEFAULT_INTENSITY, GST_PARAM_CONTROLLABLE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_stretch_finalize); - gstgt_class->map_func = stretch_map; } diff --git a/gst/geometrictransform/gsttunnel.c b/gst/geometrictransform/gsttunnel.c index c3486b7c1..5f9db9486 100644 --- a/gst/geometrictransform/gsttunnel.c +++ b/gst/geometrictransform/gsttunnel.c @@ -57,13 +57,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_tunnel_debug); #define gst_tunnel_parent_class parent_class G_DEFINE_TYPE (GstTunnel, gst_tunnel, GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM); -/* Clean up */ -static void -gst_tunnel_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean tunnel_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -106,11 +99,9 @@ tunnel_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, static void gst_tunnel_class_init (GstTunnelClass * klass) { - GObjectClass *gobject_class; GstElementClass *gstelement_class; GstGeometricTransformClass *gstgt_class; - gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; gstgt_class = (GstGeometricTransformClass *) klass; @@ -121,8 +112,6 @@ gst_tunnel_class_init (GstTunnelClass * klass) "Transform/Effect/Video", "Light tunnel effect", "Filippo Argiolas <filippo.argiolas@gmail.com>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tunnel_finalize); - gstgt_class->map_func = tunnel_map; } diff --git a/gst/geometrictransform/gsttwirl.c b/gst/geometrictransform/gsttwirl.c index 71e2b361b..54cd00ee1 100644 --- a/gst/geometrictransform/gsttwirl.c +++ b/gst/geometrictransform/gsttwirl.c @@ -116,13 +116,6 @@ gst_twirl_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_twirl_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean twirl_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -173,9 +166,8 @@ gst_twirl_class_init (GstTwirlClass * klass) "Twists the image from the center out", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_twirl_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_twirl_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_twirl_get_property); + gobject_class->set_property = gst_twirl_set_property; + gobject_class->get_property = gst_twirl_get_property; g_object_class_install_property (gobject_class, PROP_ANGLE, g_param_spec_double ("angle", "angle", diff --git a/gst/geometrictransform/gstwaterripple.c b/gst/geometrictransform/gstwaterripple.c index 4953d3c05..19c35a9a6 100644 --- a/gst/geometrictransform/gstwaterripple.c +++ b/gst/geometrictransform/gstwaterripple.c @@ -141,13 +141,6 @@ gst_water_ripple_get_property (GObject * object, guint prop_id, } } -/* Clean up */ -static void -gst_water_ripple_finalize (GObject * obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - static gboolean water_ripple_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, gdouble * in_y) @@ -203,11 +196,8 @@ gst_water_ripple_class_init (GstWaterRippleClass * klass) "Creates a water ripple effect on the image", "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_water_ripple_finalize); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_water_ripple_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_water_ripple_get_property); + gobject_class->set_property = gst_water_ripple_set_property; + gobject_class->get_property = gst_water_ripple_get_property; g_object_class_install_property (gobject_class, PROP_AMPLITUDE, g_param_spec_double ("amplitude", "amplitude", "amplitude", |