From 8d5a11a0d84632f3e60eafbacf7147e978da96cc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 Feb 2012 12:12:21 +0100 Subject: [PATCH] identity: remove custom marshaller --- plugins/elements/gstidentity.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index 63b1450..eb2f6b5 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -129,34 +129,6 @@ gst_identity_finalize (GObject * object) G_OBJECT_CLASS (parent_class)->finalize (object); } -/* fixme: do something about this */ -static void -marshal_VOID__MINIOBJECT (GClosure * closure, GValue * return_value, - guint n_param_values, const GValue * param_values, gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void (*marshalfunc_VOID__MINIOBJECT) (gpointer obj, gpointer arg1, - gpointer data2); - register marshalfunc_VOID__MINIOBJECT callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (marshalfunc_VOID__MINIOBJECT) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, g_value_get_boxed (param_values + 1), data2); -} - static void gst_identity_class_init (GstIdentityClass * klass) { @@ -251,7 +223,8 @@ gst_identity_class_init (GstIdentityClass * klass) gst_identity_signals[SIGNAL_HANDOFF] = g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstIdentityClass, handoff), NULL, NULL, - marshal_VOID__MINIOBJECT, G_TYPE_NONE, 1, GST_TYPE_BUFFER); + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, + GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE); gobject_class->finalize = gst_identity_finalize; -- 2.7.4