[farsight2/master] Remove build marshallers, but add list file in tarball
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:22:27 PST 2008
---
.gitignore | 2 +
transmitters/rawudp/Makefile.am | 2 +
transmitters/rawudp/fs-rawudp-marshal.c | 127 -------------------------------
transmitters/rawudp/fs-rawudp-marshal.h | 28 -------
4 files changed, 4 insertions(+), 155 deletions(-)
delete mode 100644 transmitters/rawudp/fs-rawudp-marshal.c
delete mode 100644 transmitters/rawudp/fs-rawudp-marshal.h
diff --git a/.gitignore b/.gitignore
index e7781bd..3644244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ Makefile.in
gst/fsrtpconference/fs-rtp-marshal.[ch]
+transmitters/rawudp/fs-rawudp-marshal.[ch]
+
gst-libs/gst/farsight/fs-marshal.[ch]
gst-libs/gst/farsight/fs-enum-types.[ch]
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index b22fdde..e595ebd 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -20,6 +20,8 @@ librawudp_transmitter_la_LIBADD = \
$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+EXTRA_librawudp_transmitter_la_SOURCES = fs-rawudp-marshal.list
+
noinst_HEADERS = \
fs-rawudp-transmitter.h \
fs-rawudp-stream-transmitter.h \
diff --git a/transmitters/rawudp/fs-rawudp-marshal.c b/transmitters/rawudp/fs-rawudp-marshal.c
deleted file mode 100644
index 0aee4dc..0000000
--- a/transmitters/rawudp/fs-rawudp-marshal.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "glib-object.h"
-#include "fs-rawudp-marshal.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_char (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)
-#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
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* VOID:BOXED,BOXED (./fs-rawudp-marshal.list:1) */
-void
-_fs_rawudp_marshal_VOID__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 void (*GMarshalFunc_VOID__BOXED_BOXED) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__BOXED_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__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_boxed (param_values + 1),
- g_marshal_value_peek_boxed (param_values + 2),
- data2);
-}
-
-/* VOID:INT,STRING,STRING (./fs-rawudp-marshal.list:2) */
-void
-_fs_rawudp_marshal_VOID__INT_STRING_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__INT_STRING_STRING) (gpointer data1,
- gint arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
- register GMarshalFunc_VOID__INT_STRING_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__INT_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_string (param_values + 3),
- data2);
-}
-
diff --git a/transmitters/rawudp/fs-rawudp-marshal.h b/transmitters/rawudp/fs-rawudp-marshal.h
deleted file mode 100644
index 4e5256a..0000000
--- a/transmitters/rawudp/fs-rawudp-marshal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#ifndef ___fs_rawudp_marshal_MARSHAL_H__
-#define ___fs_rawudp_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:BOXED,BOXED (./fs-rawudp-marshal.list:1) */
-extern void _fs_rawudp_marshal_VOID__BOXED_BOXED (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* VOID:INT,STRING,STRING (./fs-rawudp-marshal.list:2) */
-extern void _fs_rawudp_marshal_VOID__INT_STRING_STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-G_END_DECLS
-
-#endif /* ___fs_rawudp_marshal_MARSHAL_H__ */
-
--
1.5.6.5
More information about the farsight-commits
mailing list