mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst: Remove gstmarshal.[ch] completely and use the generic marshaller

Browse source 
Fixes bug #671130.
This commit is contained in:
Sebastian Dröge 2012-03-02 11:05:48 +01:00
parent 441402f9d5
commit cfe71423f0
26 changed files with 29 additions and 882 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -8,8 +8,6 @@ gstreamer_TOP := $(LOCAL_PATH)
GST_BUILT_SOURCES := \ GST_BUILT_SOURCES := \
gst/gstenumtypes.h \ gst/gstenumtypes.h \
gst/gstenumtypes.c \ gst/gstenumtypes.c \
gst/gstmarshal.h \
gst/gstmarshal.c \
gst/parse/grammar.tab.h \ gst/parse/grammar.tab.h \
gst/parse/grammar.tab.c \ gst/parse/grammar.tab.c \
gst/parse/grammar.output \ gst/parse/grammar.output \

4
Makefile.am
View file

@ -96,12 +96,10 @@ endif
# FIXME: this target should be run every time we do "make release" # FIXME: this target should be run every time we do "make release"
# find a way of automating that # find a way of automating that
win32-update: win32-update:
for f in gstversion.h gstenumtypes.c gstenumtypes.h gstmarshal.c gstmarshal.h; do \ for f in gstversion.h gstenumtypes.c gstenumtypes.h; do \
cp $(top_builddir)/gst/$$f win32/common; done cp $(top_builddir)/gst/$$f win32/common; done
$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c $(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c $(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
$(top_srcdir)/tools/gst-indent win32/common/gstmarshal.c
$(top_srcdir)/tools/gst-indent win32/common/gstmarshal.c
cp $(top_builddir)/win32/common/config.h-new \ cp $(top_builddir)/win32/common/config.h-new \
$(top_srcdir)/win32/common/config.h $(top_srcdir)/win32/common/config.h

1
docs/gst/Makefile.am
View file

@ -45,7 +45,6 @@ IGNORE_HFILES= \
gst-i18n-lib.h \ gst-i18n-lib.h \
gst_private.h \ gst_private.h \
gstelementdetails.h \ gstelementdetails.h \
gstmarshal.h \
gstmacros.h \ gstmacros.h \
\ \
grammar.tab.h \ grammar.tab.h \

22
gst/Makefile.am
View file

@ -35,11 +35,10 @@ DIST_SUBDIRS = parse
built_header_configure = gstconfig.h gstversion.h built_header_configure = gstconfig.h gstversion.h
built_header_make = gstenumtypes.h built_header_make = gstenumtypes.h
built_header_make_noinst = gstmarshal.h built_source_make = gstenumtypes.c
built_source_make = gstenumtypes.c gstmarshal.c
EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
gstmarshal.list gsttrace.c \ gsttrace.c \
gstregistrybinary.c gstregistrybinary.c
@ -111,10 +110,9 @@ nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make)
BUILT_SOURCES = \ BUILT_SOURCES = \
$(built_header_configure) \ $(built_header_configure) \
$(built_header_make) \ $(built_header_make) \
$(built_header_make_noinst) \
$(built_source_make) $(built_source_make)
# CLEANFILES is for files generated by make # CLEANFILES is for files generated by make
CLEANFILES = $(built_header_make) $(built_header_make_noinst) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
# DISTCLEANFILES is for files generated by configure # DISTCLEANFILES is for files generated by configure
DISTCLEANFILES = $(built_header_configure) DISTCLEANFILES = $(built_header_configure)
@ -211,19 +209,7 @@ noinst_HEADERS = \
gstregistrybinary.h \ gstregistrybinary.h \
gstregistrychunks.h \ gstregistrychunks.h \
gsttrace.h \ gsttrace.h \
gst_private.h \ gst_private.h
$(built_header_make_noinst)
gstmarshal.h: gstmarshal.list
$(AM_V_GEN)glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp && \
mv gstmarshal.h.tmp gstmarshal.h
gstmarshal.c: gstmarshal.list gst_private.h
$(AM_V_GEN)echo "#include \"gst_private.h\"" > gstmarshal.c.tmp && \
echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp && \
echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp && \
glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp && \
mv gstmarshal.c.tmp gstmarshal.c
gstenumtypes.h: $(gst_headers) gstenumtypes.h: $(gst_headers)
$(AM_V_GEN)glib-mkenums \ $(AM_V_GEN)glib-mkenums \

1
gst/gst.h
View file

@ -53,7 +53,6 @@
#include <gst/gstghostpad.h> #include <gst/gstghostpad.h>
#include <gst/gstinfo.h> #include <gst/gstinfo.h>
#include <gst/gstiterator.h> #include <gst/gstiterator.h>
#include <gst/gstmarshal.h>
#include <gst/gstmessage.h> #include <gst/gstmessage.h>
#include <gst/gstmemory.h> #include <gst/gstmemory.h>
#include <gst/gstminiobject.h> #include <gst/gstminiobject.h>

7
gst/gstbin.c
View file

@ -161,7 +161,6 @@
#include "gstevent.h" #include "gstevent.h"
#include "gstbin.h" #include "gstbin.h"
#include "gstmarshal.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gsterror.h" #include "gsterror.h"
@ -406,7 +405,7 @@ gst_bin_class_init (GstBinClass * klass)
gst_bin_signals[ELEMENT_ADDED] = gst_bin_signals[ELEMENT_ADDED] =
g_signal_new ("element-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("element-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_added), NULL, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_added), NULL,
NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
/** /**
* GstBin::element-removed: * GstBin::element-removed:
* @bin: the #GstBin * @bin: the #GstBin
@ -417,7 +416,7 @@ gst_bin_class_init (GstBinClass * klass)
gst_bin_signals[ELEMENT_REMOVED] = gst_bin_signals[ELEMENT_REMOVED] =
g_signal_new ("element-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("element-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_removed), NULL, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, element_removed), NULL,
NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
/** /**
* GstBin::do-latency: * GstBin::do-latency:
* @bin: the #GstBin * @bin: the #GstBin
@ -439,7 +438,7 @@ gst_bin_class_init (GstBinClass * klass)
gst_bin_signals[DO_LATENCY] = gst_bin_signals[DO_LATENCY] =
g_signal_new ("do-latency", G_TYPE_FROM_CLASS (klass), g_signal_new ("do-latency", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstBinClass, do_latency), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstBinClass, do_latency),
_gst_boolean_accumulator, NULL, gst_marshal_BOOLEAN__VOID, _gst_boolean_accumulator, NULL, g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 0, G_TYPE_NONE); G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
/** /**

4
gst/gstbus.c
View file

@ -197,7 +197,7 @@ gst_bus_class_init (GstBusClass * klass)
g_signal_new ("sync-message", G_TYPE_FROM_CLASS (klass), g_signal_new ("sync-message", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GstBusClass, sync_message), NULL, NULL, G_STRUCT_OFFSET (GstBusClass, sync_message), NULL, NULL,
g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, GST_TYPE_MESSAGE); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_MESSAGE);
/** /**
* GstBus::message: * GstBus::message:
@ -212,7 +212,7 @@ gst_bus_class_init (GstBusClass * klass)
g_signal_new ("message", G_TYPE_FROM_CLASS (klass), g_signal_new ("message", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GstBusClass, message), NULL, NULL, G_STRUCT_OFFSET (GstBusClass, message), NULL, NULL,
g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, GST_TYPE_MESSAGE); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_MESSAGE);
g_type_class_add_private (klass, sizeof (GstBusPrivate)); g_type_class_add_private (klass, sizeof (GstBusPrivate));
} }

13
gst/gstchildproxy.c
View file

@ -49,7 +49,6 @@
#include "gst_private.h" #include "gst_private.h"
#include "gstchildproxy.h" #include "gstchildproxy.h"
#include "gstmarshal.h"
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
/* signals */ /* signals */
@ -482,13 +481,11 @@ gst_child_proxy_base_init (gpointer g_class)
* *
* Will be emitted after the @object was added to the @child_proxy. * Will be emitted after the @object was added to the @child_proxy.
*/ */
/* FIXME 0.11: use GST_TYPE_OBJECT as GstChildProxy only
* supports GstObjects */
signals[CHILD_ADDED] = signals[CHILD_ADDED] =
g_signal_new ("child-added", G_TYPE_FROM_CLASS (g_class), g_signal_new ("child-added", G_TYPE_FROM_CLASS (g_class),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface,
child_added), NULL, NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, child_added), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
G_TYPE_OBJECT); 1, GST_TYPE_OBJECT);
/** /**
* GstChildProxy::child-removed: * GstChildProxy::child-removed:
@ -497,13 +494,11 @@ gst_child_proxy_base_init (gpointer g_class)
* *
* Will be emitted after the @object was removed from the @child_proxy. * Will be emitted after the @object was removed from the @child_proxy.
*/ */
/* FIXME 0.11: use GST_TYPE_OBJECT as GstChildProxy only
* supports GstObjects */
signals[CHILD_REMOVED] = signals[CHILD_REMOVED] =
g_signal_new ("child-removed", G_TYPE_FROM_CLASS (g_class), g_signal_new ("child-removed", G_TYPE_FROM_CLASS (g_class),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstChildProxyInterface,
child_removed), NULL, NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, child_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
1, G_TYPE_OBJECT); 1, GST_TYPE_OBJECT);
initialized = TRUE; initialized = TRUE;
} }

7
gst/gstelement.c
View file

@ -88,7 +88,6 @@
#include "gstelementmetadata.h" #include "gstelementmetadata.h"
#include "gstenumtypes.h" #include "gstenumtypes.h"
#include "gstbus.h" #include "gstbus.h"
#include "gstmarshal.h"
#include "gsterror.h" #include "gsterror.h"
#include "gstevent.h" #include "gstevent.h"
#include "gstutils.h" #include "gstutils.h"
@ -199,7 +198,7 @@ gst_element_class_init (GstElementClass * klass)
gst_element_signals[PAD_ADDED] = gst_element_signals[PAD_ADDED] =
g_signal_new ("pad-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("pad-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, pad_added), NULL, NULL, G_STRUCT_OFFSET (GstElementClass, pad_added), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_PAD);
/** /**
* GstElement::pad-removed: * GstElement::pad-removed:
* @gstelement: the object which received the signal * @gstelement: the object which received the signal
@ -210,7 +209,7 @@ gst_element_class_init (GstElementClass * klass)
gst_element_signals[PAD_REMOVED] = gst_element_signals[PAD_REMOVED] =
g_signal_new ("pad-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("pad-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstElementClass, pad_removed), NULL, NULL, G_STRUCT_OFFSET (GstElementClass, pad_removed), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_PAD);
/** /**
* GstElement::no-more-pads: * GstElement::no-more-pads:
* @gstelement: the object which received the signal * @gstelement: the object which received the signal
@ -222,7 +221,7 @@ gst_element_class_init (GstElementClass * klass)
gst_element_signals[NO_MORE_PADS] = gst_element_signals[NO_MORE_PADS] =
g_signal_new ("no-more-pads", G_TYPE_FROM_CLASS (klass), g_signal_new ("no-more-pads", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, no_more_pads), NULL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, no_more_pads), NULL,
NULL, gst_marshal_VOID__VOID, G_TYPE_NONE, 0); NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 0);
gobject_class->dispose = gst_element_dispose; gobject_class->dispose = gst_element_dispose;
gobject_class->finalize = gst_element_finalize; gobject_class->finalize = gst_element_finalize;

24
gst/gstmarshal.list
View file

@ -1,24 +0,0 @@
VOID:VOID
VOID:BOOLEAN
VOID:INT
VOID:STRING
VOID:BOXED
VOID:BOXED,OBJECT
VOID:POINTER,OBJECT
VOID:OBJECT
VOID:OBJECT,OBJECT
VOID:OBJECT,PARAM
VOID:OBJECT,POINTER
VOID:OBJECT,BOXED
VOID:OBJECT,BOXED,STRING
VOID:OBJECT,OBJECT,STRING
VOID:OBJECT,STRING
VOID:INT,INT
VOID:INT64
VOID:UINT,BOXED
VOID:UINT,POINTER
BOOLEAN:VOID
BOOLEAN:POINTER
BOOLEAN:BOXED
POINTER:POINTER
BOXED:BOXED

3
gst/gstobject.c
View file

@ -138,7 +138,6 @@
#include "glib-compat-private.h" #include "glib-compat-private.h"
#include "gstobject.h" #include "gstobject.h"
#include "gstmarshal.h"
#include "gstclock.h" #include "gstclock.h"
#include "gstcontrolbinding.h" #include "gstcontrolbinding.h"
#include "gstcontrolsource.h" #include "gstcontrolsource.h"
@ -235,7 +234,7 @@ gst_object_class_init (GstObjectClass * klass)
g_signal_new ("deep-notify", G_TYPE_FROM_CLASS (klass), g_signal_new ("deep-notify", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED |
G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (GstObjectClass, deep_notify), NULL, G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (GstObjectClass, deep_notify), NULL,
NULL, gst_marshal_VOID__OBJECT_PARAM, G_TYPE_NONE, 2, GST_TYPE_OBJECT, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_OBJECT,
G_TYPE_PARAM); G_TYPE_PARAM);
klass->path_string_separator = "/"; klass->path_string_separator = "/";

5
gst/gstpad.c
View file

@ -65,7 +65,6 @@
#include "gstpad.h" #include "gstpad.h"
#include "gstpadtemplate.h" #include "gstpadtemplate.h"
#include "gstenumtypes.h" #include "gstenumtypes.h"
#include "gstmarshal.h"
#include "gstutils.h" #include "gstutils.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gsterror.h" #include "gsterror.h"
@ -268,7 +267,7 @@ gst_pad_class_init (GstPadClass * klass)
gst_pad_signals[PAD_LINKED] = gst_pad_signals[PAD_LINKED] =
g_signal_new ("linked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("linked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstPadClass, linked), NULL, NULL, G_STRUCT_OFFSET (GstPadClass, linked), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_PAD);
/** /**
* GstPad::unlinked: * GstPad::unlinked:
* @pad: the pad that emitted the signal * @pad: the pad that emitted the signal
@ -279,7 +278,7 @@ gst_pad_class_init (GstPadClass * klass)
gst_pad_signals[PAD_UNLINKED] = gst_pad_signals[PAD_UNLINKED] =
g_signal_new ("unlinked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("unlinked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstPadClass, unlinked), NULL, NULL, G_STRUCT_OFFSET (GstPadClass, unlinked), NULL, NULL,
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_PAD);
pspec_caps = g_param_spec_boxed ("caps", "Caps", pspec_caps = g_param_spec_boxed ("caps", "Caps",
"The capabilities of the pad", GST_TYPE_CAPS, "The capabilities of the pad", GST_TYPE_CAPS,

3
gst/gstpadtemplate.c
View file

@ -100,7 +100,6 @@
#include "gstpad.h" #include "gstpad.h"
#include "gstpadtemplate.h" #include "gstpadtemplate.h"
#include "gstenumtypes.h" #include "gstenumtypes.h"
#include "gstmarshal.h"
#include "gstutils.h" #include "gstutils.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gsterror.h" #include "gsterror.h"
@ -153,7 +152,7 @@ gst_pad_template_class_init (GstPadTemplateClass * klass)
gst_pad_template_signals[TEMPL_PAD_CREATED] = gst_pad_template_signals[TEMPL_PAD_CREATED] =
g_signal_new ("pad-created", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("pad-created", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstPadTemplateClass, pad_created), G_STRUCT_OFFSET (GstPadTemplateClass, pad_created),
NULL, NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_PAD);
gobject_class->dispose = gst_pad_template_dispose; gobject_class->dispose = gst_pad_template_dispose;

5
gst/gstregistry.c
View file

@ -127,7 +127,6 @@
#include "gstinfo.h" #include "gstinfo.h"
#include "gsterror.h" #include "gsterror.h"
#include "gstregistry.h" #include "gstregistry.h"
#include "gstmarshal.h"
#include "gstpluginloader.h" #include "gstpluginloader.h"
@ -229,7 +228,7 @@ gst_registry_class_init (GstRegistryClass * klass)
*/ */
gst_registry_signals[PLUGIN_ADDED] = gst_registry_signals[PLUGIN_ADDED] =
g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GST_TYPE_PLUGIN); G_TYPE_NONE, 1, GST_TYPE_PLUGIN);
/** /**
@ -242,7 +241,7 @@ gst_registry_class_init (GstRegistryClass * klass)
*/ */
gst_registry_signals[FEATURE_ADDED] = gst_registry_signals[FEATURE_ADDED] =
g_signal_new ("feature-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("feature-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_marshal_VOID__OBJECT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GST_TYPE_PLUGIN_FEATURE); G_TYPE_NONE, 1, GST_TYPE_PLUGIN_FEATURE);
gobject_class->finalize = gst_registry_finalize; gobject_class->finalize = gst_registry_finalize;

1
gst/gsturi.c
View file

@ -44,7 +44,6 @@
#include "gst_private.h" #include "gst_private.h"
#include "gsturi.h" #include "gsturi.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gstmarshal.h"
#include "gstregistry.h" #include "gstregistry.h"
#include "gst-i18n-lib.h" #include "gst-i18n-lib.h"

1
libs/gst/base/gstbasesink.c
View file

@ -145,7 +145,6 @@
#include <gst/gst_private.h> #include <gst/gst_private.h>
#include "gstbasesink.h" #include "gstbasesink.h"
#include <gst/gstmarshal.h>
#include <gst/gst-i18n-lib.h> #include <gst/gst-i18n-lib.h>
GST_DEBUG_CATEGORY_STATIC (gst_base_sink_debug); GST_DEBUG_CATEGORY_STATIC (gst_base_sink_debug);

1
libs/gst/base/gstbasesrc.c
View file

@ -164,7 +164,6 @@
#include "gstbasesrc.h" #include "gstbasesrc.h"
#include "gsttypefindhelper.h" #include "gsttypefindhelper.h"
#include <gst/gstmarshal.h>
#include <gst/gst-i18n-lib.h> #include <gst/gst-i18n-lib.h>
GST_DEBUG_CATEGORY_STATIC (gst_base_src_debug); GST_DEBUG_CATEGORY_STATIC (gst_base_src_debug);

1
libs/gst/base/gstbasetransform.c
View file

@ -209,7 +209,6 @@
#include "../../../gst/gst-i18n-lib.h" #include "../../../gst/gst-i18n-lib.h"
#include "../../../gst/glib-compat-private.h" #include "../../../gst/glib-compat-private.h"
#include "gstbasetransform.h" #include "gstbasetransform.h"
#include <gst/gstmarshal.h>
GST_DEBUG_CATEGORY_STATIC (gst_base_transform_debug); GST_DEBUG_CATEGORY_STATIC (gst_base_transform_debug);
#define GST_CAT_DEFAULT gst_base_transform_debug #define GST_CAT_DEFAULT gst_base_transform_debug

2
libs/gst/base/gstindex.c
View file

@ -160,7 +160,7 @@ gst_index_class_init (GstIndexClass * klass)
gst_index_signals[ENTRY_ADDED] = gst_index_signals[ENTRY_ADDED] =
g_signal_new ("entry-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("entry-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstIndexClass, entry_added), NULL, NULL, G_STRUCT_OFFSET (GstIndexClass, entry_added), NULL, NULL,
gst_marshal_VOID__BOXED, G_TYPE_NONE, 1, GST_TYPE_INDEX_ENTRY); g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_INDEX_ENTRY);
gobject_class->set_property = gst_index_set_property; gobject_class->set_property = gst_index_set_property;
gobject_class->get_property = gst_index_get_property; gobject_class->get_property = gst_index_get_property;

1
libs/gst/base/gstpushsrc.c
View file

@ -57,7 +57,6 @@
#include "gstpushsrc.h" #include "gstpushsrc.h"
#include "gsttypefindhelper.h" #include "gsttypefindhelper.h"
#include <gst/gstmarshal.h>
GST_DEBUG_CATEGORY_STATIC (gst_push_src_debug); GST_DEBUG_CATEGORY_STATIC (gst_push_src_debug);
#define GST_CAT_DEFAULT gst_push_src_debug #define GST_CAT_DEFAULT gst_push_src_debug

5
plugins/elements/gstfakesink.c
View file

@ -38,7 +38,6 @@
#endif #endif
#include "gstfakesink.h" #include "gstfakesink.h"
#include <gst/gstmarshal.h>
#include <string.h> #include <string.h>
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@ -198,7 +197,7 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass)
gst_fake_sink_signals[SIGNAL_HANDOFF] = gst_fake_sink_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstFakeSinkClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstFakeSinkClass, handoff), NULL, NULL,
gst_marshal_VOID__BOXED_OBJECT, G_TYPE_NONE, 2, g_cclosure_marshal_generic, G_TYPE_NONE, 2,
GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD); GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD);
/** /**
@ -214,7 +213,7 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass)
gst_fake_sink_signals[SIGNAL_PREROLL_HANDOFF] = gst_fake_sink_signals[SIGNAL_PREROLL_HANDOFF] =
g_signal_new ("preroll-handoff", G_TYPE_FROM_CLASS (klass), g_signal_new ("preroll-handoff", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstFakeSinkClass, preroll_handoff), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstFakeSinkClass, preroll_handoff),
NULL, NULL, gst_marshal_VOID__BOXED_OBJECT, G_TYPE_NONE, 2, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2,
GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD); GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD);
gst_element_class_set_details_simple (gstelement_class, gst_element_class_set_details_simple (gstelement_class,

3
plugins/elements/gstfakesrc.c
View file

@ -52,7 +52,6 @@
#include <string.h> #include <string.h>
#include "gstfakesrc.h" #include "gstfakesrc.h"
#include <gst/gstmarshal.h>
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
@ -335,7 +334,7 @@ gst_fake_src_class_init (GstFakeSrcClass * klass)
gst_fake_src_signals[SIGNAL_HANDOFF] = gst_fake_src_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL,
gst_marshal_VOID__BOXED_OBJECT, G_TYPE_NONE, 2, g_cclosure_marshal_generic, G_TYPE_NONE, 2,
GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD); GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD);
gst_element_class_set_details_simple (gstelement_class, gst_element_class_set_details_simple (gstelement_class,

3
plugins/elements/gstidentity.c
View file

@ -36,7 +36,6 @@
#include "../../gst/gst-i18n-lib.h" #include "../../gst/gst-i18n-lib.h"
#include "gstidentity.h" #include "gstidentity.h"
#include <gst/gstmarshal.h>
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -223,7 +222,7 @@ gst_identity_class_init (GstIdentityClass * klass)
gst_identity_signals[SIGNAL_HANDOFF] = gst_identity_signals[SIGNAL_HANDOFF] =
g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstIdentityClass, handoff), NULL, NULL, G_STRUCT_OFFSET (GstIdentityClass, handoff), NULL, NULL,
g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE); GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE);
gobject_class->finalize = gst_identity_finalize; gobject_class->finalize = gst_identity_finalize;

2
plugins/elements/gsttypefindelement.c
View file

@ -235,7 +235,7 @@ gst_type_find_element_class_init (GstTypeFindElementClass * typefind_class)
gst_type_find_element_signals[HAVE_TYPE] = g_signal_new ("have-type", gst_type_find_element_signals[HAVE_TYPE] = g_signal_new ("have-type",
G_TYPE_FROM_CLASS (typefind_class), G_SIGNAL_RUN_FIRST, G_TYPE_FROM_CLASS (typefind_class), G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL, G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL,
gst_marshal_VOID__UINT_BOXED, G_TYPE_NONE, 2, g_cclosure_marshal_generic, G_TYPE_NONE, 2,
G_TYPE_UINT, GST_TYPE_CAPS | G_SIGNAL_TYPE_STATIC_SCOPE); G_TYPE_UINT, GST_TYPE_CAPS | G_SIGNAL_TYPE_STATIC_SCOPE);
typefind_class->have_type = typefind_class->have_type =

621
win32/common/gstmarshal.c
View file

@ -1,621 +0,0 @@
#include "gst_private.h"
#include "glib-object.h"
#include "gstmarshal.h"
#include <glib-object.h>
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
#define g_marshal_value_peek_char(v) g_value_get_schar (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
#define g_marshal_value_peek_long(v) g_value_get_long (v)
#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
#define g_marshal_value_peek_float(v) g_value_get_float (v)
#define g_marshal_value_peek_double(v) g_value_get_double (v)
#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
#define g_marshal_value_peek_param(v) g_value_get_param (v)
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
* g_value_get_*() functions
*/
#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
#define g_marshal_value_peek_char(v) (v)->data[0].v_int
#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
#define g_marshal_value_peek_int(v) (v)->data[0].v_int
#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
#define g_marshal_value_peek_long(v) (v)->data[0].v_long
#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
#define g_marshal_value_peek_float(v) (v)->data[0].v_float
#define g_marshal_value_peek_double(v) (v)->data[0].v_double
#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
/* VOID:VOID (./gstmarshal.list:1) */
/* VOID:BOOLEAN (./gstmarshal.list:2) */
/* VOID:INT (./gstmarshal.list:3) */
/* VOID:STRING (./gstmarshal.list:4) */
/* VOID:BOXED (./gstmarshal.list:5) */
/* VOID:BOXED,OBJECT (./gstmarshal.list:6) */
void
gst_marshal_VOID__BOXED_OBJECT (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__BOXED_OBJECT) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__BOXED_OBJECT callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__BOXED_OBJECT) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_boxed (param_values + 1),
g_marshal_value_peek_object (param_values + 2), data2);
}
/* VOID:POINTER,OBJECT (./gstmarshal.list:7) */
void
gst_marshal_VOID__POINTER_OBJECT (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_OBJECT) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__POINTER_OBJECT callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__POINTER_OBJECT) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_pointer (param_values + 1),
g_marshal_value_peek_object (param_values + 2), data2);
}
/* VOID:OBJECT (./gstmarshal.list:8) */
/* VOID:OBJECT,OBJECT (./gstmarshal.list:9) */
void
gst_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_OBJECT callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_object (param_values + 2), data2);
}
/* VOID:OBJECT,PARAM (./gstmarshal.list:10) */
void
gst_marshal_VOID__OBJECT_PARAM (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_PARAM) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_PARAM callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__OBJECT_PARAM) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_param (param_values + 2), data2);
}
/* VOID:OBJECT,POINTER (./gstmarshal.list:11) */
void
gst_marshal_VOID__OBJECT_POINTER (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_POINTER callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_pointer (param_values + 2), data2);
}
/* VOID:OBJECT,BOXED (./gstmarshal.list:12) */
void
gst_marshal_VOID__OBJECT_BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_BOXED) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__OBJECT_BOXED) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_boxed (param_values + 2), data2);
}
/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:13) */
void
gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_BOXED_STRING) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
register GMarshalFunc_VOID__OBJECT_BOXED_STRING callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 4);
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 =
(GMarshalFunc_VOID__OBJECT_BOXED_STRING) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_boxed (param_values + 2),
g_marshal_value_peek_string (param_values + 3), data2);
}
/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:14) */
void
gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_STRING) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
register GMarshalFunc_VOID__OBJECT_OBJECT_STRING callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 4);
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 =
(GMarshalFunc_VOID__OBJECT_OBJECT_STRING) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_object (param_values + 2),
g_marshal_value_peek_string (param_values + 3), data2);
}
/* VOID:OBJECT,STRING (./gstmarshal.list:15) */
void
gst_marshal_VOID__OBJECT_STRING (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1,
gpointer arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__OBJECT_STRING callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_string (param_values + 2), data2);
}
/* VOID:INT,INT (./gstmarshal.list:16) */
void
gst_marshal_VOID__INT_INT (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
gint arg_1, gint arg_2, gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_marshal_value_peek_int (param_values + 1),
g_marshal_value_peek_int (param_values + 2), data2);
}
/* VOID:INT64 (./gstmarshal.list:17) */
void
gst_marshal_VOID__INT64 (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT64) (gpointer data1,
gint64 arg_1, gpointer data2);
register GMarshalFunc_VOID__INT64 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 =
(GMarshalFunc_VOID__INT64) (marshal_data ? marshal_data : cc->callback);
callback (data1, g_marshal_value_peek_int64 (param_values + 1), data2);
}
/* VOID:UINT,BOXED (./gstmarshal.list:18) */
void
gst_marshal_VOID__UINT_BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__UINT_BOXED) (gpointer data1,
guint arg_1, gpointer arg_2, gpointer data2);
register GMarshalFunc_VOID__UINT_BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
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 =
(GMarshalFunc_VOID__UINT_BOXED) (marshal_data ? marshal_data :
cc->callback);
callback (data1,
g_marshal_value_peek_uint (param_values + 1),
g_marshal_value_peek_boxed (param_values + 2), data2);
}
/* VOID:UINT,POINTER (./gstmarshal.list:19) */
/* BOOLEAN:VOID (./gstmarshal.list:20) */
void
gst_marshal_BOOLEAN__VOID (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1,
gpointer data2);
register GMarshalFunc_BOOLEAN__VOID callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gboolean v_return;
g_return_if_fail (return_value != NULL);
g_return_if_fail (n_param_values == 1);
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 =
(GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1, data2);
g_value_set_boolean (return_value, v_return);
}
/* BOOLEAN:POINTER (./gstmarshal.list:21) */
void
gst_marshal_BOOLEAN__POINTER (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_BOOLEAN__POINTER callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gboolean v_return;
g_return_if_fail (return_value != NULL);
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 =
(GMarshalFunc_BOOLEAN__POINTER) (marshal_data ? marshal_data :
cc->callback);
v_return = callback (data1,
g_marshal_value_peek_pointer (param_values + 1), data2);
g_value_set_boolean (return_value, v_return);
}
/* BOOLEAN:BOXED (./gstmarshal.list:22) */
void
gst_marshal_BOOLEAN__BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_BOOLEAN__BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gboolean v_return;
g_return_if_fail (return_value != NULL);
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 =
(GMarshalFunc_BOOLEAN__BOXED) (marshal_data ? marshal_data :
cc->callback);
v_return = callback (data1,
g_marshal_value_peek_boxed (param_values + 1), data2);
g_value_set_boolean (return_value, v_return);
}
/* POINTER:POINTER (./gstmarshal.list:23) */
void
gst_marshal_POINTER__POINTER (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__POINTER) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_POINTER__POINTER callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gpointer v_return;
g_return_if_fail (return_value != NULL);
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 =
(GMarshalFunc_POINTER__POINTER) (marshal_data ? marshal_data :
cc->callback);
v_return = callback (data1,
g_marshal_value_peek_pointer (param_values + 1), data2);
g_value_set_pointer (return_value, v_return);
}
/* BOXED:BOXED (./gstmarshal.list:24) */
void
gst_marshal_BOXED__BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_BOXED__BOXED) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_BOXED__BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gpointer v_return;
g_return_if_fail (return_value != NULL);
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 =
(GMarshalFunc_BOXED__BOXED) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1,
g_marshal_value_peek_boxed (param_values + 1), data2);
g_value_take_boxed (return_value, v_return);
}

169
win32/common/gstmarshal.h
View file

@ -1,169 +0,0 @@
#ifndef __gst_marshal_MARSHAL_H__
#define __gst_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:VOID (./gstmarshal.list:1) */
#define gst_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID
/* VOID:BOOLEAN (./gstmarshal.list:2) */
#define gst_marshal_VOID__BOOLEAN g_cclosure_marshal_VOID__BOOLEAN
/* VOID:INT (./gstmarshal.list:3) */
#define gst_marshal_VOID__INT g_cclosure_marshal_VOID__INT
/* VOID:STRING (./gstmarshal.list:4) */
#define gst_marshal_VOID__STRING g_cclosure_marshal_VOID__STRING
/* VOID:BOXED (./gstmarshal.list:5) */
#define gst_marshal_VOID__BOXED g_cclosure_marshal_VOID__BOXED
/* VOID:BOXED,OBJECT (./gstmarshal.list:6) */
extern void gst_marshal_VOID__BOXED_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:POINTER,OBJECT (./gstmarshal.list:7) */
extern void gst_marshal_VOID__POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT (./gstmarshal.list:8) */
#define gst_marshal_VOID__OBJECT g_cclosure_marshal_VOID__OBJECT
/* VOID:OBJECT,OBJECT (./gstmarshal.list:9) */
extern void gst_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,PARAM (./gstmarshal.list:10) */
extern void gst_marshal_VOID__OBJECT_PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,POINTER (./gstmarshal.list:11) */
extern void gst_marshal_VOID__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,BOXED (./gstmarshal.list:12) */
extern void gst_marshal_VOID__OBJECT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:13) */
extern void gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:14) */
extern void gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,STRING (./gstmarshal.list:15) */
extern void gst_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT (./gstmarshal.list:16) */
extern void gst_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT64 (./gstmarshal.list:17) */
extern void gst_marshal_VOID__INT64 (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT,BOXED (./gstmarshal.list:18) */
extern void gst_marshal_VOID__UINT_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:UINT,POINTER (./gstmarshal.list:19) */
#define gst_marshal_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTER
/* BOOLEAN:VOID (./gstmarshal.list:20) */
extern void gst_marshal_BOOLEAN__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOLEAN:POINTER (./gstmarshal.list:21) */
extern void gst_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOLEAN:BOXED (./gstmarshal.list:22) */
extern void gst_marshal_BOOLEAN__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER (./gstmarshal.list:23) */
extern void gst_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOXED:BOXED (./gstmarshal.list:24) */
extern void gst_marshal_BOXED__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
G_END_DECLS
#endif /* __gst_marshal_MARSHAL_H__ */