From fe098e3aff1af9ecbe48f1cf99ef3b27029ca772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 4 Aug 2013 10:47:38 +0100 Subject: [PATCH] udp: remove unused marshal and enumtypes files --- Makefile.am | 10 +-- gst/udp/.gitignore | 12 ---- win32/common/gstudp-enumtypes.c | 25 ------- win32/common/gstudp-enumtypes.h | 19 ----- win32/common/gstudp-marshal.c | 119 -------------------------------- win32/common/gstudp-marshal.h | 28 -------- 6 files changed, 1 insertion(+), 212 deletions(-) delete mode 100644 gst/udp/.gitignore delete mode 100644 win32/common/gstudp-enumtypes.c delete mode 100644 win32/common/gstudp-enumtypes.h delete mode 100644 win32/common/gstudp-marshal.c delete mode 100644 win32/common/gstudp-marshal.h diff --git a/Makefile.am b/Makefile.am index c2bba40f31..594ed14b99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,19 +46,11 @@ check-torture: endif win32-update: - for f in gst/udp/gstudp-marshal.c \ - gst/udp/gstudp-marshal.h \ - gst/udp/gstudp-enumtypes.c \ - gst/udp/gstudp-enumtypes.h \ - sys/v4l2/tuner-enumtypes.c \ + for f in sys/v4l2/tuner-enumtypes.c \ sys/v4l2/tuner-enumtypes.h \ sys/v4l2/tuner-marshal.c \ sys/v4l2/tuner-marshal.h; do \ cp $(top_builddir)/$$f win32/common; done - $(top_srcdir)/common/gst-indent win32/common/gstudp-marshal.c - $(top_srcdir)/common/gst-indent win32/common/gstudp-marshal.c - $(top_srcdir)/common/gst-indent win32/common/gstudp-enumtypes.c - $(top_srcdir)/common/gst-indent win32/common/gstudp-enumtypes.c $(top_srcdir)/common/gst-indent win32/common/tuner-enumtypes.c $(top_srcdir)/common/gst-indent win32/common/tuner-enumtypes.c $(top_srcdir)/common/gst-indent win32/common/tuner-marshal.c diff --git a/gst/udp/.gitignore b/gst/udp/.gitignore deleted file mode 100644 index 6290889ecf..0000000000 --- a/gst/udp/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -*.o -*.lo -*.la -.deps -.libs -gstudp-enumtypes.c -gstudp-enumtypes.h -gstudp-marshal.c -gstudp-marshal.h - diff --git a/win32/common/gstudp-enumtypes.c b/win32/common/gstudp-enumtypes.c deleted file mode 100644 index 7982ccd09c..0000000000 --- a/win32/common/gstudp-enumtypes.c +++ /dev/null @@ -1,25 +0,0 @@ - - - -#include "gstudp-enumtypes.h" - -#include "gstudp.h" - -/* enumerations from "gstudp.h" */ -GType -gst_udp_control_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {CONTROL_ZERO, "CONTROL_ZERO", "zero"}, - {CONTROL_NONE, "CONTROL_NONE", "none"}, - {CONTROL_UDP, "CONTROL_UDP", "udp"}, - {CONTROL_TCP, "CONTROL_TCP", "tcp"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstUDPControl", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} diff --git a/win32/common/gstudp-enumtypes.h b/win32/common/gstudp-enumtypes.h deleted file mode 100644 index 5f2dca2c2a..0000000000 --- a/win32/common/gstudp-enumtypes.h +++ /dev/null @@ -1,19 +0,0 @@ - - - -#ifndef __GST_UDP_ENUM_TYPES_H__ -#define __GST_UDP_ENUM_TYPES_H__ - -#include - -G_BEGIN_DECLS - -/* enumerations from "gstudp.h" */ -GType gst_udp_control_get_type (void); -#define GST_TYPE_UDP_CONTROL (gst_udp_control_get_type()) -G_END_DECLS - -#endif /* __GST_UDP_ENUM_TYPES_H__ */ - - - diff --git a/win32/common/gstudp-marshal.c b/win32/common/gstudp-marshal.c deleted file mode 100644 index e769f0ae89..0000000000 --- a/win32/common/gstudp-marshal.c +++ /dev/null @@ -1,119 +0,0 @@ -#include "gstudp-marshal.h" - -#include - - -#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:STRING,INT (gstudp-marshal.list:1) */ -void -gst_udp_marshal_VOID__STRING_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__STRING_INT) (gpointer data1, - gpointer arg_1, gint arg_2, gpointer data2); - register GMarshalFunc_VOID__STRING_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__STRING_INT) (marshal_data ? marshal_data : - cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_int (param_values + 2), data2); -} - -/* BOXED:STRING,INT (gstudp-marshal.list:2) */ -void -gst_udp_marshal_BOXED__STRING_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 gpointer (*GMarshalFunc_BOXED__STRING_INT) (gpointer data1, - gpointer arg_1, gint arg_2, gpointer data2); - register GMarshalFunc_BOXED__STRING_INT 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 == 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_BOXED__STRING_INT) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_int (param_values + 2), data2); - - g_value_take_boxed (return_value, v_return); -} diff --git a/win32/common/gstudp-marshal.h b/win32/common/gstudp-marshal.h deleted file mode 100644 index d103bc3761..0000000000 --- a/win32/common/gstudp-marshal.h +++ /dev/null @@ -1,28 +0,0 @@ - -#ifndef __gst_udp_marshal_MARSHAL_H__ -#define __gst_udp_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:STRING,INT (gstudp-marshal.list:1) */ -extern void gst_udp_marshal_VOID__STRING_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOXED:STRING,INT (gstudp-marshal.list:2) */ -extern void gst_udp_marshal_BOXED__STRING_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gst_udp_marshal_MARSHAL_H__ */ -