v4l2: remove unused enumtypes and use generic marshaller

6 files changed, 4 insertions, 32 deletions

diff --git a/sys/v4l2/.gitignore b/sys/v4l2/.gitignore
deleted file mode 100644
index 1ad32f9b4..000000000
--- a/sys/v4l2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gstv4l2-marshal.c
-gstv4l2-marshal.h
diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index cec939bf2..da138ae56 100644
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -8,26 +8,6 @@ xv_source =
 xv_libs =
 endif
 
-# variables used for enum/marshal generation
-glib_enum_headers = tuner.h tunernorm.h	tunerchannel.h
-glib_enum_define = GST_INTERFACES
-glib_gen_prefix = gst_interfaces
-glib_gen_basename = tuner
-
-built_sources = \
-	tuner-marshal.c \
-	tuner-enumtypes.c
-
-built_headers = \
-	tuner-marshal.h \
-	tuner-enumtypes.h
-
-EXTRA_DIST = tuner-marshal.list
-
-CLEANFILES = $(built_sources) $(built_headers)
-
-BUILT_SOURCES = $(built_sources) $(built_headers)
-
 include $(top_srcdir)/common/gst-glib-gen.mak
 
 libgstvideo4linux2_la_SOURCES = gstv4l2.c \
@@ -44,7 +24,6 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.c \
 				tunerchannel.c \
 				tunernorm.c \
 				$(xv_source)
-nodist_libgstvideo4linux2_la_SOURCES = $(built_sources) $(built_headers)
 
 libgstvideo4linux2_la_CFLAGS =   $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
diff --git a/sys/v4l2/gstv4l2-marshal.list b/sys/v4l2/gstv4l2-marshal.list
deleted file mode 100644
index 266c72291..000000000
--- a/sys/v4l2/gstv4l2-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:INT,UINT,UINT,UINT
diff --git a/sys/v4l2/tuner-marshal.list b/sys/v4l2/tuner-marshal.list
deleted file mode 100644
index c99ddc7d2..000000000
--- a/sys/v4l2/tuner-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:OBJECT,ULONG
-VOID:OBJECT,INT
diff --git a/sys/v4l2/tuner.c b/sys/v4l2/tuner.c
index 738bd4fd1..eb897b541 100644
--- a/sys/v4l2/tuner.c
+++ b/sys/v4l2/tuner.c
@@ -24,7 +24,6 @@
 #endif
 
 #include "tuner.h"
-#include "tuner-marshal.h"
 
 #include <string.h>
 
@@ -157,8 +156,8 @@ gst_tuner_class_init (GstTunerInterface * iface)
         GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
         G_STRUCT_OFFSET (GstTunerInterface, frequency_changed),
         NULL, NULL,
-        gst_interfaces_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2,
-        GST_TYPE_TUNER_CHANNEL, G_TYPE_ULONG);
+        g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_TUNER_CHANNEL,
+        G_TYPE_ULONG);
     /**
      * GstTuner::signal-changed:
      * @tuner: The element providing the GstTuner interface
@@ -174,8 +173,8 @@ gst_tuner_class_init (GstTunerInterface * iface)
         GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
         G_STRUCT_OFFSET (GstTunerInterface, signal_changed),
         NULL, NULL,
-        gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2,
-        GST_TYPE_TUNER_CHANNEL, G_TYPE_INT);
+        g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_TUNER_CHANNEL,
+        G_TYPE_INT);
 
     initialized = TRUE;
   }
diff --git a/sys/v4l2/tuner.h b/sys/v4l2/tuner.h
index d245a170b..7297e4b40 100644
--- a/sys/v4l2/tuner.h
+++ b/sys/v4l2/tuner.h
@@ -26,7 +26,6 @@
 
 #include "tunernorm.h"
 #include "tunerchannel.h"
-#include "tuner-enumtypes.h"
 
 G_BEGIN_DECLS