From 0314b482f36113e1416a6dc3876b611627419c78 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Mon, 26 Aug 2019 07:54:48 +0200 Subject: [PATCH] Don't pass default GLib marshallers for signals By passing NULL to `g_signal_new` instead of a marshaller, GLib will actually internally optimize the signal (if the marshaller is available in GLib itself) by also setting the valist marshaller. This makes the signal emission a bit more performant than the regular marshalling, which still needs to box into `GValue` and call libffi in case of a generic marshaller. Note that for custom marshallers, one would use `g_signal_set_va_marshaller()` with the valist marshaller instead. --- ext/cdparanoia/gstcdparanoiasrc.c | 4 +- ext/gl/gstglfilterapp.c | 2 +- ext/gl/gstglfilterbin.c | 3 +- ext/gl/gstglfiltershader.c | 3 +- ext/gl/gstglimagesink.c | 16 +++---- ext/gl/gstglmixerbin.c | 3 +- ext/gl/gstglsinkbin.c | 3 +- ext/gl/gstglsrcbin.c | 3 +- gst-libs/gst/app/gstappsink.c | 2 +- gst-libs/gst/app/gstappsrc.c | 2 +- gst-libs/gst/gl/gstgldisplay.c | 4 +- gst-libs/gst/gl/gstglwindow.c | 8 ++-- gst-libs/gst/pbutils/gstdiscoverer.c | 13 +++--- gst-libs/gst/rtsp/gstrtspextension.c | 4 +- gst/encoding/gstencodebin.c | 7 ++- gst/overlaycomposition/gstoverlaycomposition.c | 13 ++---- gst/playback/gstdecodebin2.c | 24 +++++----- gst/playback/gstdecodebin3.c | 5 +-- gst/playback/gstparsebin.c | 27 +++++------ gst/playback/gstplaybin2.c | 62 +++++++++++++------------- gst/playback/gstplaybin3.c | 10 ++--- gst/playback/gstplaysink.c | 5 +-- gst/playback/gsturidecodebin.c | 28 +++++------- gst/playback/gsturidecodebin3.c | 10 ++--- gst/playback/gsturisourcebin.c | 11 +++-- gst/tcp/gstmultifdsink.c | 23 +++++----- gst/tcp/gstmultihandlesink.c | 2 +- gst/tcp/gstmultisocketsink.c | 29 ++++++------ 28 files changed, 141 insertions(+), 185 deletions(-) diff --git a/ext/cdparanoia/gstcdparanoiasrc.c b/ext/cdparanoia/gstcdparanoiasrc.c index 4c512be..dfdabdb 100644 --- a/ext/cdparanoia/gstcdparanoiasrc.c +++ b/ext/cdparanoia/gstcdparanoiasrc.c @@ -180,7 +180,7 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass) g_signal_new ("transport-error", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstCdParanoiaSrcClass, transport_error), - NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); /** * GstCdParanoiaSrc::uncorrected-error: * @cdparanoia: The CdParanoia instance @@ -193,7 +193,7 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass) g_signal_new ("uncorrected-error", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstCdParanoiaSrcClass, uncorrected_error), - NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); } static gboolean diff --git a/ext/gl/gstglfilterapp.c b/ext/gl/gstglfilterapp.c index 8426d03..042645b 100644 --- a/ext/gl/gstglfilterapp.c +++ b/ext/gl/gstglfilterapp.c @@ -108,7 +108,7 @@ gst_gl_filter_app_class_init (GstGLFilterAppClass * klass) */ gst_gl_filter_app_signals[CLIENT_DRAW_SIGNAL] = g_signal_new ("client-draw", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); gst_element_class_set_metadata (element_class, diff --git a/ext/gl/gstglfilterbin.c b/ext/gl/gstglfilterbin.c index 338f22b..46b6187 100644 --- a/ext/gl/gstglfilterbin.c +++ b/ext/gl/gstglfilterbin.c @@ -100,8 +100,7 @@ gst_gl_filter_bin_class_init (GstGLFilterBinClass * klass) */ gst_gl_filter_bin_signals[SIGNAL_CREATE_ELEMENT] = g_signal_new ("create-element", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_ELEMENT, 0); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_ELEMENT, 0); gst_element_class_set_metadata (element_class, "GL Filter Bin", "Filter/Video", diff --git a/ext/gl/gstglfiltershader.c b/ext/gl/gstglfiltershader.c index 3ebc72a..10ce1cb 100644 --- a/ext/gl/gstglfiltershader.c +++ b/ext/gl/gstglfiltershader.c @@ -158,8 +158,7 @@ gst_gl_filtershader_class_init (GstGLFilterShaderClass * klass) */ gst_gl_shader_signals[SIGNAL_CREATE_SHADER] = g_signal_new ("create-shader", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_GL_SHADER, 0); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_GL_SHADER, 0); gst_element_class_set_metadata (element_class, "OpenGL fragment shader filter", "Filter/Effect", diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index 15074f8..c06e29f 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -290,13 +290,13 @@ gst_gl_image_sink_bin_class_init (GstGLImageSinkBinClass * klass) gst_gl_image_sink_bin_signals[SIGNAL_BIN_CLIENT_DRAW] = g_signal_new ("client-draw", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 2, - GST_TYPE_GL_CONTEXT, GST_TYPE_SAMPLE); + 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 2, GST_TYPE_GL_CONTEXT, + GST_TYPE_SAMPLE); gst_gl_image_sink_bin_signals[SIGNAL_BIN_CLIENT_RESHAPE] = g_signal_new ("client-reshape", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 3, GST_TYPE_GL_CONTEXT, G_TYPE_UINT, G_TYPE_UINT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 3, + GST_TYPE_GL_CONTEXT, G_TYPE_UINT, G_TYPE_UINT); } #define GST_GLIMAGE_SINK_GET_LOCK(glsink) \ @@ -719,8 +719,8 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) */ gst_glimage_sink_signals[CLIENT_DRAW_SIGNAL] = g_signal_new ("client-draw", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 2, GST_TYPE_GL_CONTEXT, GST_TYPE_SAMPLE); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 2, + GST_TYPE_GL_CONTEXT, GST_TYPE_SAMPLE); /** * GstGLImageSink::client-reshape: @@ -736,8 +736,8 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass) */ gst_glimage_sink_signals[CLIENT_RESHAPE_SIGNAL] = g_signal_new ("client-reshape", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 3, GST_TYPE_GL_CONTEXT, G_TYPE_UINT, G_TYPE_UINT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 3, + GST_TYPE_GL_CONTEXT, G_TYPE_UINT, G_TYPE_UINT); gst_element_class_add_static_pad_template (element_class, &gst_glimage_sink_template); diff --git a/ext/gl/gstglmixerbin.c b/ext/gl/gstglmixerbin.c index 47a390d..541469f 100644 --- a/ext/gl/gstglmixerbin.c +++ b/ext/gl/gstglmixerbin.c @@ -214,8 +214,7 @@ gst_gl_mixer_bin_class_init (GstGLMixerBinClass * klass) */ gst_gl_mixer_bin_signals[SIGNAL_CREATE_ELEMENT] = g_signal_new ("create-element", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_ELEMENT, 0); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_ELEMENT, 0); gst_element_class_add_static_pad_template (element_class, &src_factory); diff --git a/ext/gl/gstglsinkbin.c b/ext/gl/gstglsinkbin.c index c03bea2..a4d3bfd 100644 --- a/ext/gl/gstglsinkbin.c +++ b/ext/gl/gstglsinkbin.c @@ -210,8 +210,7 @@ gst_gl_sink_bin_class_init (GstGLSinkBinClass * klass) */ gst_gl_sink_bin_signals[SIGNAL_CREATE_ELEMENT] = g_signal_new ("create-element", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_ELEMENT, 0); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_ELEMENT, 0); gst_element_class_set_metadata (element_class, "GL Sink Bin", "Sink/Video", diff --git a/ext/gl/gstglsrcbin.c b/ext/gl/gstglsrcbin.c index e1004d2..fe9a040 100644 --- a/ext/gl/gstglsrcbin.c +++ b/ext/gl/gstglsrcbin.c @@ -96,8 +96,7 @@ gst_gl_src_bin_class_init (GstGLSrcBinClass * klass) */ gst_gl_src_bin_signals[SIGNAL_CREATE_ELEMENT] = g_signal_new ("create-element", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_ELEMENT, 0); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_ELEMENT, 0); gst_element_class_set_metadata (element_class, "GL Src Bin", "Src/Video", diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c index cac9821..f14032a 100644 --- a/gst-libs/gst/app/gstappsink.c +++ b/gst-libs/gst/app/gstappsink.c @@ -264,7 +264,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass) gst_app_sink_signals[SIGNAL_EOS] = g_signal_new ("eos", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSinkClass, eos), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstAppSink::new-preroll: * @appsink: the appsink element that emitted the signal diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c index 5bdeb37..a36c97d 100644 --- a/gst-libs/gst/app/gstappsrc.c +++ b/gst-libs/gst/app/gstappsrc.c @@ -441,7 +441,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_ENOUGH_DATA] = g_signal_new ("enough-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSrcClass, enough_data), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstAppSrc::seek-data: diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index ba11328..de185f8 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -172,8 +172,8 @@ gst_gl_display_class_init (GstGLDisplayClass * klass) */ gst_gl_display_signals[CREATE_CONTEXT] = g_signal_new ("create-context", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_GL_CONTEXT, 1, GST_TYPE_GL_CONTEXT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_GL_CONTEXT, 1, + GST_TYPE_GL_CONTEXT); klass->get_handle = gst_gl_display_default_get_handle; klass->get_foreign_display = gst_gl_display_default_get_foreign_display; diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c index a99fcad..720bb62 100644 --- a/gst-libs/gst/gl/gstglwindow.c +++ b/gst-libs/gst/gl/gstglwindow.c @@ -212,8 +212,8 @@ gst_gl_window_class_init (GstGLWindowClass * klass) */ gst_gl_window_signals[EVENT_MOUSE_SIGNAL] = g_signal_new ("mouse-event", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_STRING, + G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE); /** * GstGLWindow::key-event: @@ -227,8 +227,8 @@ gst_gl_window_class_init (GstGLWindowClass * klass) */ gst_gl_window_signals[EVENT_KEY_SIGNAL] = g_signal_new ("key-event", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRING, + G_TYPE_STRING); _init_debug (); } diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 5598915..919d773 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -270,8 +270,8 @@ gst_discoverer_class_init (GstDiscovererClass * klass) */ gst_discoverer_signals[SIGNAL_FINISHED] = g_signal_new ("finished", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstDiscovererClass, finished), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstDiscovererClass, finished), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstDiscoverer::starting: @@ -281,8 +281,8 @@ gst_discoverer_class_init (GstDiscovererClass * klass) */ gst_discoverer_signals[SIGNAL_STARTING] = g_signal_new ("starting", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstDiscovererClass, starting), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstDiscovererClass, starting), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstDiscoverer::discovered: @@ -302,8 +302,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass) */ gst_discoverer_signals[SIGNAL_DISCOVERED] = g_signal_new ("discovered", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstDiscovererClass, discovered), - NULL, NULL, g_cclosure_marshal_generic, + G_STRUCT_OFFSET (GstDiscovererClass, discovered), NULL, NULL, NULL, G_TYPE_NONE, 2, GST_TYPE_DISCOVERER_INFO, G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -323,7 +322,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass) gst_discoverer_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiscovererClass, source_setup), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); } static void diff --git a/gst-libs/gst/rtsp/gstrtspextension.c b/gst-libs/gst/rtsp/gstrtspextension.c index 86f7da5..ab31791 100644 --- a/gst-libs/gst/rtsp/gstrtspextension.c +++ b/gst-libs/gst/rtsp/gstrtspextension.c @@ -79,8 +79,8 @@ gst_rtsp_extension_iface_init (GstRTSPExtension * iface) gst_rtsp_extension_signals[SIGNAL_SEND] = g_signal_new ("send", G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPExtensionInterface, - send), NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, G_TYPE_POINTER); + send), NULL, NULL, NULL, GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, + G_TYPE_POINTER); initialized = TRUE; } } diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c index 6f8cc5e..de1e2bb 100644 --- a/gst/encoding/gstencodebin.c +++ b/gst/encoding/gstencodebin.c @@ -399,8 +399,7 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass) gst_encode_bin_signals[SIGNAL_REQUEST_PAD] = g_signal_new ("request-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstEncodeBinClass, - request_pad), NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_PAD, 1, GST_TYPE_CAPS); + request_pad), NULL, NULL, NULL, GST_TYPE_PAD, 1, GST_TYPE_CAPS); /** * GstEncodeBin::request-profile-pad @@ -417,8 +416,8 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass) gst_encode_bin_signals[SIGNAL_REQUEST_PROFILE_PAD] = g_signal_new ("request-profile-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstEncodeBinClass, - request_profile_pad), NULL, NULL, g_cclosure_marshal_generic, - GST_TYPE_PAD, 1, G_TYPE_STRING); + request_profile_pad), NULL, NULL, NULL, GST_TYPE_PAD, 1, + G_TYPE_STRING); klass->request_pad = gst_encode_bin_request_pad_signal; klass->request_profile_pad = gst_encode_bin_request_profile_pad_signal; diff --git a/gst/overlaycomposition/gstoverlaycomposition.c b/gst/overlaycomposition/gstoverlaycomposition.c index f9a4ebc..0329aaa 100644 --- a/gst/overlaycomposition/gstoverlaycomposition.c +++ b/gst/overlaycomposition/gstoverlaycomposition.c @@ -127,12 +127,7 @@ gst_overlay_composition_class_init (GstOverlayCompositionClass * klass) */ overlay_composition_signals[SIGNAL_DRAW] = g_signal_new ("draw", - G_TYPE_FROM_CLASS (klass), - 0, - 0, - NULL, - NULL, - g_cclosure_marshal_generic, + G_TYPE_FROM_CLASS (klass), 0, 0, NULL, NULL, NULL, GST_TYPE_VIDEO_OVERLAY_COMPOSITION, 1, GST_TYPE_SAMPLE); /** @@ -150,10 +145,8 @@ gst_overlay_composition_class_init (GstOverlayCompositionClass * klass) */ overlay_composition_signals[SIGNAL_CAPS_CHANGED] = g_signal_new ("caps-changed", - G_TYPE_FROM_CLASS (klass), - 0, - 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 3, GST_TYPE_CAPS, - G_TYPE_UINT, G_TYPE_UINT); + G_TYPE_FROM_CLASS (klass), 0, 0, NULL, NULL, NULL, G_TYPE_NONE, 3, + GST_TYPE_CAPS, G_TYPE_UINT, G_TYPE_UINT); } static void diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 2cee08a..443fd0e 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -724,8 +724,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, unknown_type), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, NULL, NULL, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstDecodeBin::autoplug-continue: @@ -748,8 +747,8 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_AUTOPLUG_CONTINUE] = g_signal_new ("autoplug-continue", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_continue), - _gst_boolean_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, GST_TYPE_CAPS); + _gst_boolean_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, + GST_TYPE_CAPS); /** * GstDecodeBin::autoplug-factories: @@ -778,8 +777,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("autoplug-factories", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_factories), _gst_array_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, G_TYPE_VALUE_ARRAY, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstDecodeBin::autoplug-sort: @@ -808,8 +806,8 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("autoplug-sort", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_sort), _gst_array_hasvalue_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, - GST_TYPE_CAPS, G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); + NULL, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, GST_TYPE_CAPS, + G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstDecodeBin::autoplug-select: @@ -848,8 +846,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("autoplug-select", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_select), _gst_select_accumulator, NULL, - g_cclosure_marshal_generic, - GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, + NULL, GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, GST_TYPE_ELEMENT_FACTORY); /** @@ -869,9 +866,8 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_AUTOPLUG_QUERY] = g_signal_new ("autoplug-query", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_query), - _gst_boolean_or_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, GST_TYPE_ELEMENT, - GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); + _gst_boolean_or_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, + GST_TYPE_ELEMENT, GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstDecodeBin::drained @@ -882,7 +878,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_DRAINED] = g_signal_new ("drained", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, drained), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); g_object_class_install_property (gobject_klass, PROP_CAPS, g_param_spec_boxed ("caps", "Caps", "The caps on which to stop decoding.", diff --git a/gst/playback/gstdecodebin3.c b/gst/playback/gstdecodebin3.c index fcd730b..6762299 100644 --- a/gst/playback/gstdecodebin3.c +++ b/gst/playback/gstdecodebin3.c @@ -567,7 +567,7 @@ gst_decodebin3_class_init (GstDecodebin3Class * klass) gst_decodebin3_signals[SIGNAL_SELECT_STREAM] = g_signal_new ("select-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodebin3Class, select_stream), - _gst_int_accumulator, NULL, g_cclosure_marshal_generic, + _gst_int_accumulator, NULL, NULL, G_TYPE_INT, 2, GST_TYPE_STREAM_COLLECTION, GST_TYPE_STREAM); /** @@ -578,8 +578,7 @@ gst_decodebin3_class_init (GstDecodebin3Class * klass) */ gst_decodebin3_signals[SIGNAL_ABOUT_TO_FINISH] = g_signal_new ("about-to-finish", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 0, G_TYPE_NONE); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); element_class->request_new_pad = diff --git a/gst/playback/gstparsebin.c b/gst/playback/gstparsebin.c index 8194224..dbd5e3d 100644 --- a/gst/playback/gstparsebin.c +++ b/gst/playback/gstparsebin.c @@ -638,8 +638,7 @@ gst_parse_bin_class_init (GstParseBinClass * klass) gst_parse_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, unknown_type), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, NULL, NULL, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstParseBin::autoplug-continue: @@ -662,8 +661,8 @@ gst_parse_bin_class_init (GstParseBinClass * klass) gst_parse_bin_signals[SIGNAL_AUTOPLUG_CONTINUE] = g_signal_new ("autoplug-continue", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, autoplug_continue), - _gst_boolean_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, GST_TYPE_CAPS); + _gst_boolean_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, + GST_TYPE_CAPS); /** * GstParseBin::autoplug-factories: @@ -692,8 +691,7 @@ gst_parse_bin_class_init (GstParseBinClass * klass) g_signal_new ("autoplug-factories", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, autoplug_factories), _gst_array_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, G_TYPE_VALUE_ARRAY, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstParseBin::autoplug-sort: @@ -722,8 +720,8 @@ gst_parse_bin_class_init (GstParseBinClass * klass) g_signal_new ("autoplug-sort", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, autoplug_sort), _gst_array_hasvalue_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, - GST_TYPE_CAPS, G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); + NULL, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, GST_TYPE_CAPS, + G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstParseBin::autoplug-select: @@ -761,10 +759,8 @@ gst_parse_bin_class_init (GstParseBinClass * klass) gst_parse_bin_signals[SIGNAL_AUTOPLUG_SELECT] = g_signal_new ("autoplug-select", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, autoplug_select), - _gst_select_accumulator, NULL, - g_cclosure_marshal_generic, - GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, - GST_TYPE_ELEMENT_FACTORY); + _gst_select_accumulator, NULL, NULL, GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, + GST_TYPE_PAD, GST_TYPE_CAPS, GST_TYPE_ELEMENT_FACTORY); /** * GstParseBin::autoplug-query: @@ -784,9 +780,8 @@ gst_parse_bin_class_init (GstParseBinClass * klass) gst_parse_bin_signals[SIGNAL_AUTOPLUG_QUERY] = g_signal_new ("autoplug-query", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, autoplug_query), - _gst_boolean_or_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, GST_TYPE_ELEMENT, - GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); + _gst_boolean_or_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, + GST_TYPE_ELEMENT, GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstParseBin::drained: @@ -797,7 +792,7 @@ gst_parse_bin_class_init (GstParseBinClass * klass) gst_parse_bin_signals[SIGNAL_DRAINED] = g_signal_new ("drained", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstParseBinClass, drained), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); g_object_class_install_property (gobject_klass, PROP_SUBTITLE_ENCODING, g_param_spec_string ("subtitle-encoding", "subtitle encoding", diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 1ea0170..1571c82 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -1039,8 +1039,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_ABOUT_TO_FINISH] = g_signal_new ("about-to-finish", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, about_to_finish), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstPlayBinClass, about_to_finish), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstPlayBin::video-changed: @@ -1058,8 +1058,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_VIDEO_CHANGED] = g_signal_new ("video-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, video_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstPlayBinClass, video_changed), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstPlayBin::audio-changed * @playbin: a #GstPlayBin @@ -1076,8 +1076,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_AUDIO_CHANGED] = g_signal_new ("audio-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, audio_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstPlayBinClass, audio_changed), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstPlayBin::text-changed: * @playbin: a #GstPlayBin @@ -1094,8 +1094,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_TEXT_CHANGED] = g_signal_new ("text-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, text_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstPlayBinClass, text_changed), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstPlayBin::video-tags-changed: @@ -1112,8 +1112,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_VIDEO_TAGS_CHANGED] = g_signal_new ("video-tags-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, video_tags_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, video_tags_changed), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_INT); /** * GstPlayBin::audio-tags-changed: @@ -1130,8 +1130,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_AUDIO_TAGS_CHANGED] = g_signal_new ("audio-tags-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, audio_tags_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, audio_tags_changed), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_INT); /** * GstPlayBin::text-tags-changed: @@ -1148,8 +1148,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_TEXT_TAGS_CHANGED] = g_signal_new ("text-tags-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstPlayBinClass, text_tags_changed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, text_tags_changed), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_INT); /** * GstPlayBin::source-setup: @@ -1167,8 +1167,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass) */ gst_play_bin_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstPlayBin::element-setup: @@ -1188,8 +1187,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass) */ gst_play_bin_signals[SIGNAL_ELEMENT_SETUP] = g_signal_new ("element-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstPlayBin::get-video-tags: @@ -1205,8 +1203,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_VIDEO_TAGS] = g_signal_new ("get-video-tags", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_video_tags), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_TAG_LIST, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_video_tags), NULL, NULL, NULL, + GST_TYPE_TAG_LIST, 1, G_TYPE_INT); /** * GstPlayBin::get-audio-tags: * @playbin: a #GstPlayBin @@ -1221,8 +1219,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_AUDIO_TAGS] = g_signal_new ("get-audio-tags", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_audio_tags), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_TAG_LIST, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_audio_tags), NULL, NULL, NULL, + GST_TYPE_TAG_LIST, 1, G_TYPE_INT); /** * GstPlayBin::get-text-tags: * @playbin: a #GstPlayBin @@ -1237,8 +1235,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_TEXT_TAGS] = g_signal_new ("get-text-tags", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_text_tags), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_TAG_LIST, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_text_tags), NULL, NULL, NULL, + GST_TYPE_TAG_LIST, 1, G_TYPE_INT); /** * GstPlayBin::convert-sample: * @playbin: a #GstPlayBin @@ -1257,8 +1255,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_CONVERT_SAMPLE] = g_signal_new ("convert-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, convert_sample), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); + G_STRUCT_OFFSET (GstPlayBinClass, convert_sample), NULL, NULL, NULL, + GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); /** * GstPlayBin::get-video-pad: @@ -1275,8 +1273,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_VIDEO_PAD] = g_signal_new ("get-video-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_video_pad), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_PAD, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_video_pad), NULL, NULL, NULL, + GST_TYPE_PAD, 1, G_TYPE_INT); /** * GstPlayBin::get-audio-pad: * @playbin: a #GstPlayBin @@ -1292,8 +1290,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_AUDIO_PAD] = g_signal_new ("get-audio-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_audio_pad), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_PAD, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_audio_pad), NULL, NULL, NULL, + GST_TYPE_PAD, 1, G_TYPE_INT); /** * GstPlayBin::get-text-pad: * @playbin: a #GstPlayBin @@ -1309,8 +1307,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gst_play_bin_signals[SIGNAL_GET_TEXT_PAD] = g_signal_new ("get-text-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstPlayBinClass, get_text_pad), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_PAD, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstPlayBinClass, get_text_pad), NULL, NULL, NULL, + GST_TYPE_PAD, 1, G_TYPE_INT); klass->get_video_tags = gst_play_bin_get_video_tags; klass->get_audio_tags = gst_play_bin_get_audio_tags; diff --git a/gst/playback/gstplaybin3.c b/gst/playback/gstplaybin3.c index 8889977..05bb122 100644 --- a/gst/playback/gstplaybin3.c +++ b/gst/playback/gstplaybin3.c @@ -986,7 +986,7 @@ gst_play_bin3_class_init (GstPlayBin3Class * klass) g_signal_new ("about-to-finish", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstPlayBin3Class, about_to_finish), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + NULL, G_TYPE_NONE, 0, G_TYPE_NONE); /** @@ -1005,8 +1005,7 @@ gst_play_bin3_class_init (GstPlayBin3Class * klass) */ gst_play_bin3_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstPlayBin3::element-setup: @@ -1026,8 +1025,7 @@ gst_play_bin3_class_init (GstPlayBin3Class * klass) */ gst_play_bin3_signals[SIGNAL_ELEMENT_SETUP] = g_signal_new ("element-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstPlayBin3::convert-sample @@ -1048,7 +1046,7 @@ gst_play_bin3_class_init (GstPlayBin3Class * klass) g_signal_new ("convert-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstPlayBin3Class, convert_sample), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); + NULL, GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); klass->convert_sample = gst_play_bin3_convert_sample; diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c index e619fe1..7d62b51 100644 --- a/gst/playback/gstplaysink.c +++ b/gst/playback/gstplaysink.c @@ -614,8 +614,7 @@ gst_play_sink_class_init (GstPlaySinkClass * klass) g_signal_new ("reconfigure", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstPlaySinkClass, - reconfigure), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_BOOLEAN, - 0, G_TYPE_NONE); + reconfigure), NULL, NULL, NULL, G_TYPE_BOOLEAN, 0, G_TYPE_NONE); /** * GstPlaySink::convert-sample: * @playsink: a #GstPlaySink @@ -634,7 +633,7 @@ gst_play_sink_class_init (GstPlaySinkClass * klass) g_signal_new ("convert-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstPlaySinkClass, convert_sample), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); + NULL, GST_TYPE_SAMPLE, 1, GST_TYPE_CAPS); gst_element_class_add_static_pad_template (gstelement_klass, &audiorawtemplate); diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 943b3e7..8b259b0 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -503,8 +503,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) gst_uri_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, unknown_type), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, NULL, NULL, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstURIDecodeBin::autoplug-continue: @@ -528,8 +527,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-continue", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_continue), _gst_boolean_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, - GST_TYPE_CAPS); + NULL, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstURIDecodeBin::autoplug-factories: @@ -558,8 +556,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-factories", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_factories), _gst_array_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 2, - GST_TYPE_PAD, GST_TYPE_CAPS); + NULL, G_TYPE_VALUE_ARRAY, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** * GstURIDecodeBin::autoplug-sort: @@ -588,8 +585,8 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-sort", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_sort), _gst_array_hasvalue_accumulator, NULL, - g_cclosure_marshal_generic, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, - GST_TYPE_CAPS, G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); + NULL, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, GST_TYPE_CAPS, + G_TYPE_VALUE_ARRAY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstURIDecodeBin::autoplug-select: @@ -628,8 +625,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-select", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_select), _gst_select_accumulator, NULL, - g_cclosure_marshal_generic, - GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, + NULL, GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, GST_TYPE_ELEMENT_FACTORY); /** @@ -649,9 +645,8 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) gst_uri_decode_bin_signals[SIGNAL_AUTOPLUG_QUERY] = g_signal_new ("autoplug-query", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_query), - _gst_boolean_or_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, GST_TYPE_ELEMENT, - GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); + _gst_boolean_or_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 3, GST_TYPE_PAD, + GST_TYPE_ELEMENT, GST_TYPE_QUERY | G_SIGNAL_TYPE_STATIC_SCOPE); /** * GstURIDecodeBin::drained: @@ -661,8 +656,8 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) gst_uri_decode_bin_signals[SIGNAL_DRAINED] = g_signal_new ("drained", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstURIDecodeBinClass, drained), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstURIDecodeBinClass, drained), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstURIDecodeBin::source-setup: @@ -677,8 +672,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) */ gst_uri_decode_bin_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); gst_element_class_add_static_pad_template (gstelement_class, &srctemplate); gst_element_class_set_static_metadata (gstelement_class, diff --git a/gst/playback/gsturidecodebin3.c b/gst/playback/gsturidecodebin3.c index 8b1840d..9bfaacb 100644 --- a/gst/playback/gsturidecodebin3.c +++ b/gst/playback/gsturidecodebin3.c @@ -461,8 +461,8 @@ gst_uri_decode_bin3_class_init (GstURIDecodeBin3Class * klass) gst_uri_decode_bin3_signals[SIGNAL_SELECT_STREAM] = g_signal_new ("select-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBin3Class, select_stream), - _gst_int_accumulator, NULL, g_cclosure_marshal_generic, - G_TYPE_INT, 2, GST_TYPE_STREAM_COLLECTION, GST_TYPE_STREAM); + _gst_int_accumulator, NULL, NULL, G_TYPE_INT, 2, + GST_TYPE_STREAM_COLLECTION, GST_TYPE_STREAM); /** * GstURIDecodeBin3::source-setup: @@ -476,8 +476,7 @@ gst_uri_decode_bin3_class_init (GstURIDecodeBin3Class * klass) */ gst_uri_decode_bin3_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstURIDecodeBin3::about-to-finish: * @@ -486,8 +485,7 @@ gst_uri_decode_bin3_class_init (GstURIDecodeBin3Class * klass) */ gst_uri_decode_bin3_signals[SIGNAL_ABOUT_TO_FINISH] = g_signal_new ("about-to-finish", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 0, G_TYPE_NONE); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); gst_element_class_add_static_pad_template (gstelement_class, diff --git a/gst/playback/gsturisourcebin.c b/gst/playback/gsturisourcebin.c index 8aed417..7a25102 100644 --- a/gst/playback/gsturisourcebin.c +++ b/gst/playback/gsturisourcebin.c @@ -413,8 +413,8 @@ gst_uri_source_bin_class_init (GstURISourceBinClass * klass) gst_uri_source_bin_signals[SIGNAL_DRAINED] = g_signal_new ("drained", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstURISourceBinClass, drained), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstURISourceBinClass, drained), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstURISourceBin::about-to-finish: @@ -424,8 +424,8 @@ gst_uri_source_bin_class_init (GstURISourceBinClass * klass) gst_uri_source_bin_signals[SIGNAL_ABOUT_TO_FINISH] = g_signal_new ("about-to-finish", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstURISourceBinClass, about_to_finish), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstURISourceBinClass, about_to_finish), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); /** * GstURISourceBin::source-setup: @@ -442,8 +442,7 @@ gst_uri_source_bin_class_init (GstURISourceBinClass * klass) */ gst_uri_source_bin_signals[SIGNAL_SOURCE_SETUP] = g_signal_new ("source-setup", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&srctemplate)); diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 1de1cf2..32f9eec 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -236,7 +236,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) g_signal_new ("add", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, add), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, G_TYPE_NONE, 1, G_TYPE_INT); /** * GstMultiFdSink::add-full: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -256,9 +256,8 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) g_signal_new ("add-full", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, add_full), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 6, - G_TYPE_INT, GST_TYPE_SYNC_METHOD, GST_TYPE_FORMAT, G_TYPE_UINT64, - GST_TYPE_FORMAT, G_TYPE_UINT64); + NULL, G_TYPE_NONE, 6, G_TYPE_INT, GST_TYPE_SYNC_METHOD, GST_TYPE_FORMAT, + G_TYPE_UINT64, GST_TYPE_FORMAT, G_TYPE_UINT64); /** * GstMultiFdSink::remove: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -270,7 +269,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) g_signal_new ("remove", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, remove), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, G_TYPE_NONE, 1, G_TYPE_INT); /** * GstMultiFdSink::remove-flush: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -283,7 +282,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) g_signal_new ("remove-flush", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, remove_flush), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, G_TYPE_NONE, 1, G_TYPE_INT); /** * GstMultiFdSink::get-stats: @@ -309,7 +308,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, get_stats), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_STRUCTURE, 1, G_TYPE_INT); + NULL, GST_TYPE_STRUCTURE, 1, G_TYPE_INT); /** * GstMultiFdSink::client-added: @@ -322,8 +321,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) */ gst_multi_fd_sink_signals[SIGNAL_CLIENT_ADDED] = g_signal_new ("client-added", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 1, G_TYPE_INT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); /** * GstMultiFdSink::client-removed: * @gstmultifdsink: the multifdsink element that emitted this signal @@ -340,8 +338,8 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) */ gst_multi_fd_sink_signals[SIGNAL_CLIENT_REMOVED] = g_signal_new ("client-removed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 2, G_TYPE_INT, GST_TYPE_CLIENT_STATUS); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, + GST_TYPE_CLIENT_STATUS); /** * GstMultiFdSink::client-fd-removed: * @gstmultifdsink: the multifdsink element that emitted this signal @@ -357,8 +355,7 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) */ gst_multi_fd_sink_signals[SIGNAL_CLIENT_FD_REMOVED] = g_signal_new ("client-fd-removed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, G_TYPE_INT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); gst_element_class_set_static_metadata (gstelement_class, "Multi filedescriptor sink", "Sink/Network", diff --git a/gst/tcp/gstmultihandlesink.c b/gst/tcp/gstmultihandlesink.c index 38af70a..791a1d3 100644 --- a/gst/tcp/gstmultihandlesink.c +++ b/gst/tcp/gstmultihandlesink.c @@ -455,7 +455,7 @@ gst_multi_handle_sink_class_init (GstMultiHandleSinkClass * klass) g_signal_new ("clear", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiHandleSinkClass, clear), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0); + NULL, G_TYPE_NONE, 0); gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate); diff --git a/gst/tcp/gstmultisocketsink.c b/gst/tcp/gstmultisocketsink.c index fe040fb..f601064 100644 --- a/gst/tcp/gstmultisocketsink.c +++ b/gst/tcp/gstmultisocketsink.c @@ -272,7 +272,7 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) g_signal_new ("add", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiSocketSinkClass, add), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_SOCKET); + NULL, G_TYPE_NONE, 1, G_TYPE_SOCKET); /** * GstMultiSocketSink::add-full: * @gstmultisocketsink: the multisocketsink element to emit this signal on @@ -292,9 +292,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) g_signal_new ("add-full", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiSocketSinkClass, add_full), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 6, - G_TYPE_SOCKET, GST_TYPE_SYNC_METHOD, GST_TYPE_FORMAT, G_TYPE_UINT64, - GST_TYPE_FORMAT, G_TYPE_UINT64); + NULL, G_TYPE_NONE, 6, G_TYPE_SOCKET, GST_TYPE_SYNC_METHOD, + GST_TYPE_FORMAT, G_TYPE_UINT64, GST_TYPE_FORMAT, G_TYPE_UINT64); /** * GstMultiSocketSink::remove: * @gstmultisocketsink: the multisocketsink element to emit this signal on @@ -305,8 +304,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) gst_multi_socket_sink_signals[SIGNAL_REMOVE] = g_signal_new ("remove", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstMultiSocketSinkClass, remove), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_SOCKET); + G_STRUCT_OFFSET (GstMultiSocketSinkClass, remove), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_SOCKET); /** * GstMultiSocketSink::remove-flush: * @gstmultisocketsink: the multisocketsink element to emit this signal on @@ -318,8 +317,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) gst_multi_socket_sink_signals[SIGNAL_REMOVE_FLUSH] = g_signal_new ("remove-flush", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstMultiSocketSinkClass, remove_flush), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_SOCKET); + G_STRUCT_OFFSET (GstMultiSocketSinkClass, remove_flush), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_SOCKET); /** * GstMultiSocketSink::get-stats: @@ -338,8 +337,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) gst_multi_socket_sink_signals[SIGNAL_GET_STATS] = g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GstMultiSocketSinkClass, get_stats), NULL, NULL, - g_cclosure_marshal_generic, GST_TYPE_STRUCTURE, 1, G_TYPE_SOCKET); + G_STRUCT_OFFSET (GstMultiSocketSinkClass, get_stats), NULL, NULL, NULL, + GST_TYPE_STRUCTURE, 1, G_TYPE_SOCKET); /** * GstMultiSocketSink::client-added: @@ -352,8 +351,7 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) */ gst_multi_socket_sink_signals[SIGNAL_CLIENT_ADDED] = g_signal_new ("client-added", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, G_TYPE_OBJECT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); /** * GstMultiSocketSink::client-removed: * @gstmultisocketsink: the multisocketsink element that emitted this signal @@ -370,8 +368,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) */ gst_multi_socket_sink_signals[SIGNAL_CLIENT_REMOVED] = g_signal_new ("client-removed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 2, G_TYPE_SOCKET, GST_TYPE_CLIENT_STATUS); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_SOCKET, + GST_TYPE_CLIENT_STATUS); /** * GstMultiSocketSink::client-socket-removed: * @gstmultisocketsink: the multisocketsink element that emitted this signal @@ -387,8 +385,7 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) */ gst_multi_socket_sink_signals[SIGNAL_CLIENT_SOCKET_REMOVED] = g_signal_new ("client-socket-removed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, G_TYPE_SOCKET); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_SOCKET); gst_element_class_set_static_metadata (gstelement_class, "Multi socket sink", "Sink/Network", -- 2.7.4