mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove ges-marshal.[ch] and use the generic marshaller

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-03-12 15:46:42 +00:00
parent 7504f0f097
commit 1f37aefdcd
9 changed files with 24 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ges/Makefile.am
View file

@ -1,10 +1,8 @@
built_header_make = gesmarshal.h built_header_make =
built_source_make = gesmarshal.c built_source_make =
lib_LTLIBRARIES = libges-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libges-@GST_MAJORMINOR@.la
EXTRA_libges_@GST_MAJORMINOR@_la_SOURCES = gesmarshal.list
CLEANFILES = $(BUILT_SOURCES) $(built_header_make) $(built_source_make) CLEANFILES = $(BUILT_SOURCES) $(built_header_make) $(built_source_make)
libges_@GST_MAJORMINOR@_la_SOURCES = \ libges_@GST_MAJORMINOR@_la_SOURCES = \
@ -107,15 +105,6 @@ BUILT_SOURCES = \
$(built_header_make) \ $(built_header_make) \
$(built_source_make) $(built_source_make)
gesmarshal.h: gesmarshal.list
glib-genmarshal --header --prefix=ges_marshal $^ > gesmarshal.h.tmp
mv gesmarshal.h.tmp gesmarshal.h
gesmarshal.c: gesmarshal.list
echo "#include \"glib-object.h\"" >gesmarshal.c.tmp
echo "#include \"gesmarshal.h\"" >> gesmarshal.c.tmp
glib-genmarshal --body --prefix=ges_marshal $^ >> gesmarshal.c.tmp
mv gesmarshal.c.tmp gesmarshal.c
include $(top_srcdir)/common/gst-glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak
if HAVE_INTROSPECTION if HAVE_INTROSPECTION

5
ges/ges-formatter.c
View file

@ -46,7 +46,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <stdlib.h> #include <stdlib.h>
#include "gesmarshal.h"
#include "ges-formatter.h" #include "ges-formatter.h"
#include "ges-keyfile-formatter.h" #include "ges-keyfile-formatter.h"
#include "ges-internal.h" #include "ges-internal.h"
@ -102,7 +101,7 @@ ges_formatter_class_init (GESFormatterClass * klass)
*/ */
ges_formatter_signals[SOURCE_MOVED_SIGNAL] = ges_formatter_signals[SOURCE_MOVED_SIGNAL] =
g_signal_new ("source-moved", G_TYPE_FROM_CLASS (klass), g_signal_new ("source-moved", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
1, GES_TYPE_TIMELINE_FILE_SOURCE); 1, GES_TYPE_TIMELINE_FILE_SOURCE);
/** /**
@ -111,7 +110,7 @@ ges_formatter_class_init (GESFormatterClass * klass)
*/ */
ges_formatter_signals[LOADED_SIGNAL] = ges_formatter_signals[LOADED_SIGNAL] =
g_signal_new ("loaded", G_TYPE_FROM_CLASS (klass), g_signal_new ("loaded", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
1, GES_TYPE_TIMELINE); 1, GES_TYPE_TIMELINE);
object_class->dispose = ges_formatter_dispose; object_class->dispose = ges_formatter_dispose;

4
ges/ges-simple-timeline-layer.c
View file

@ -35,7 +35,6 @@
#include <ges/ges.h> #include <ges/ges.h>
#include "ges-internal.h" #include "ges-internal.h"
#include "gesmarshal.h"
static void static void
ges_simple_timeline_layer_object_removed (GESTimelineLayer * layer, ges_simple_timeline_layer_object_removed (GESTimelineLayer * layer,
@ -145,8 +144,7 @@ ges_simple_timeline_layer_class_init (GESSimpleTimelineLayerClass * klass)
g_signal_new ("object-moved", G_TYPE_FROM_CLASS (klass), g_signal_new ("object-moved", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESSimpleTimelineLayerClass, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESSimpleTimelineLayerClass,
object_moved), object_moved),
NULL, NULL, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 3,
ges_marshal_VOID__OBJECT_INT_INT, G_TYPE_NONE, 3,
GES_TYPE_TIMELINE_OBJECT, G_TYPE_INT, G_TYPE_INT); GES_TYPE_TIMELINE_OBJECT, G_TYPE_INT, G_TYPE_INT);
} }

7
ges/ges-timeline-layer.c
View file

@ -30,7 +30,6 @@
*/ */
#include "ges-internal.h" #include "ges-internal.h"
#include "gesmarshal.h"
#include "ges-timeline-layer.h" #include "ges-timeline-layer.h"
#include "ges.h" #include "ges.h"
#include "ges-timeline-source.h" #include "ges-timeline-source.h"
@ -187,7 +186,7 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
ges_timeline_layer_signals[OBJECT_ADDED] = ges_timeline_layer_signals[OBJECT_ADDED] =
g_signal_new ("object-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("object-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added),
NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
GES_TYPE_TIMELINE_OBJECT); GES_TYPE_TIMELINE_OBJECT);
/** /**
@ -200,8 +199,8 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
ges_timeline_layer_signals[OBJECT_REMOVED] = ges_timeline_layer_signals[OBJECT_REMOVED] =
g_signal_new ("object-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("object-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass,
object_removed), NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, object_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
GES_TYPE_TIMELINE_OBJECT); 1, GES_TYPE_TIMELINE_OBJECT);
} }
static void static void

11
ges/ges-timeline-object.c
View file

@ -31,9 +31,10 @@
#include "ges-timeline-object.h" #include "ges-timeline-object.h"
#include "ges.h" #include "ges.h"
#include "gesmarshal.h"
#include "ges-internal.h" #include "ges-internal.h"
#include <string.h>
gboolean gboolean
ges_timeline_object_fill_track_object_func (GESTimelineObject * object, ges_timeline_object_fill_track_object_func (GESTimelineObject * object,
GESTrackObject * trackobj, GstElement * gnlobj); GESTrackObject * trackobj, GstElement * gnlobj);
@ -327,7 +328,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
*/ */
ges_timeline_object_signals[EFFECT_ADDED] = ges_timeline_object_signals[EFFECT_ADDED] =
g_signal_new ("effect-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("effect-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT);
/** /**
@ -341,7 +342,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
*/ */
ges_timeline_object_signals[EFFECT_REMOVED] = ges_timeline_object_signals[EFFECT_REMOVED] =
g_signal_new ("effect-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("effect-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_EFFECT);
/** /**
@ -355,7 +356,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
*/ */
ges_timeline_object_signals[TRACK_OBJECT_ADDED] = ges_timeline_object_signals[TRACK_OBJECT_ADDED] =
g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
/** /**
@ -369,7 +370,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
*/ */
ges_timeline_object_signals[TRACK_OBJECT_REMOVED] = ges_timeline_object_signals[TRACK_OBJECT_REMOVED] =
g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
klass->need_fill_track = TRUE; klass->need_fill_track = TRUE;

14
ges/ges-timeline.c
View file

@ -36,7 +36,6 @@
* documentation about #GESFormatter. * documentation about #GESFormatter.
*/ */
#include "gesmarshal.h"
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-timeline.h" #include "ges-timeline.h"
#include "ges-track.h" #include "ges-track.h"
@ -225,7 +224,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
ges_timeline_signals[TRACK_ADDED] = ges_timeline_signals[TRACK_ADDED] =
g_signal_new ("track-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_added), NULL, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_added), NULL,
NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TRACK); NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_TRACK);
/** /**
* GESTimeline::track-removed * GESTimeline::track-removed
@ -237,7 +236,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
ges_timeline_signals[TRACK_REMOVED] = ges_timeline_signals[TRACK_REMOVED] =
g_signal_new ("track-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_removed), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, track_removed),
NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TRACK); NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_TRACK);
/** /**
* GESTimeline::layer-added * GESTimeline::layer-added
@ -249,7 +248,8 @@ ges_timeline_class_init (GESTimelineClass * klass)
ges_timeline_signals[LAYER_ADDED] = ges_timeline_signals[LAYER_ADDED] =
g_signal_new ("layer-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("layer-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_added), NULL, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_added), NULL,
NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GES_TYPE_TIMELINE_LAYER); NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
GES_TYPE_TIMELINE_LAYER);
/** /**
* GESTimeline::layer-removed * GESTimeline::layer-removed
@ -261,7 +261,7 @@ ges_timeline_class_init (GESTimelineClass * klass)
ges_timeline_signals[LAYER_REMOVED] = ges_timeline_signals[LAYER_REMOVED] =
g_signal_new ("layer-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("layer-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_removed), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineClass, layer_removed),
NULL, NULL, ges_marshal_VOID__OBJECT, G_TYPE_NONE, 1, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
GES_TYPE_TIMELINE_LAYER); GES_TYPE_TIMELINE_LAYER);
/** /**
@ -273,8 +273,8 @@ ges_timeline_class_init (GESTimelineClass * klass)
*/ */
ges_timeline_signals[DISCOVERY_ERROR] = ges_timeline_signals[DISCOVERY_ERROR] =
g_signal_new ("discovery-error", G_TYPE_FROM_CLASS (klass), g_signal_new ("discovery-error", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, gst_marshal_VOID__OBJECT_BOXED, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 2, GES_TYPE_TIMELINE_FILE_SOURCE, GST_TYPE_G_ERROR); G_TYPE_NONE, 2, GES_TYPE_TIMELINE_FILE_SOURCE, G_TYPE_ERROR);
} }
static void static void

3
ges/ges-track-object.c
View file

@ -31,7 +31,6 @@
*/ */
#include "ges-internal.h" #include "ges-internal.h"
#include "gesmarshal.h"
#include "ges-track-object.h" #include "ges-track-object.h"
#include "ges-timeline-object.h" #include "ges-timeline-object.h"
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
@ -305,7 +304,7 @@ ges_track_object_class_init (GESTrackObjectClass * klass)
ges_track_object_signals[DEEP_NOTIFY] = ges_track_object_signals[DEEP_NOTIFY] =
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, 0, NULL, NULL, gst_marshal_VOID__OBJECT_PARAM, G_SIGNAL_NO_HOOKS, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 2, GST_TYPE_ELEMENT, G_TYPE_PARAM); G_TYPE_NONE, 2, GST_TYPE_ELEMENT, G_TYPE_PARAM);
klass->create_gnl_object = ges_track_object_create_gnl_object_func; klass->create_gnl_object = ges_track_object_create_gnl_object_func;

5
ges/ges-track.c
View file

@ -32,7 +32,6 @@
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-track.h" #include "ges-track.h"
#include "ges-track-object.h" #include "ges-track-object.h"
#include "gesmarshal.h"
G_DEFINE_TYPE (GESTrack, ges_track, GST_TYPE_BIN); G_DEFINE_TYPE (GESTrack, ges_track, GST_TYPE_BIN);
@ -259,7 +258,7 @@ ges_track_class_init (GESTrackClass * klass)
*/ */
ges_track_signals[TRACK_OBJECT_ADDED] = ges_track_signals[TRACK_OBJECT_ADDED] =
g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-object-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
/** /**
@ -273,7 +272,7 @@ ges_track_class_init (GESTrackClass * klass)
*/ */
ges_track_signals[TRACK_OBJECT_REMOVED] = ges_track_signals[TRACK_OBJECT_REMOVED] =
g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT); G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
} }

1
ges/ges-utils.c
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "gesmarshal.h"
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-timeline.h" #include "ges-timeline.h"
#include "ges-track.h" #include "ges-track.h"