uvch264src: Use generic marshaller

diff --git a/sys/uvch264/Makefile.am b/sys/uvch264/Makefile.am
index 8ecff113f2cd970fef919bc207c7c462cdd83255..a647fa9980540287e5796737f8061b8ae568cd57 100644 (file)
--- a/sys/uvch264/Makefile.am
+++ b/sys/uvch264/Makefile.am
@@ -1,18 +1,6 @@
 glib_gen_prefix = __gst_uvc_h264
 glib_gen_basename = gstuvch264
 
 glib_gen_prefix = __gst_uvc_h264
 glib_gen_basename = gstuvch264
 

-include $(top_srcdir)/common/gst-glib-gen.mak
-
-built_sources = gstuvch264-marshal.c
-built_headers = gstuvch264-marshal.h
-
-BUILT_SOURCES = $(built_sources) $(built_headers)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = gstuvch264-marshal.list
-
-

 plugin_LTLIBRARIES = libgstuvch264.la
 
 libgstuvch264_la_SOURCES = gstuvch264.c \
 plugin_LTLIBRARIES = libgstuvch264.la
 
 libgstuvch264_la_SOURCES = gstuvch264.c \


@@ -20,8 +8,6 @@ libgstuvch264_la_SOURCES = gstuvch264.c \
                           gstuvch264_src.c \
                           uvc_h264.c
 
                           gstuvch264_src.c \
                           uvc_h264.c
 

-nodist_libgstuvch264_la_SOURCES = $(built_sources)
-

 libgstuvch264_la_CFLAGS =   $(GST_PLUGINS_BAD_CFLAGS) \
                            $(GST_PLUGINS_BASE_CFLAGS) \
                            $(GST_BASE_CFLAGS) \
 libgstuvch264_la_CFLAGS =   $(GST_PLUGINS_BAD_CFLAGS) \
                            $(GST_PLUGINS_BASE_CFLAGS) \
                            $(GST_BASE_CFLAGS) \

diff --git a/sys/uvch264/gstuvch264-marshal.list b/sys/uvch264/gstuvch264-marshal.list
deleted file mode 100644 (file)
index a9ec0dd..0000000
--- a/sys/uvch264/gstuvch264-marshal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-BOOLEAN:STRING,POINTER,POINTER,POINTER
-BOOLEAN:STRING,POINTER,POINTER
-BOOLEAN:STRING,POINTER

diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index 69555d3e1eb1e0bef65471fa969f1fa216d89269..21b6c8c15b83e8ff3c19c32380cd75acbddf30bd 100644 (file)
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -64,7 +64,6 @@ typedef struct
 #endif
 
 #include "gstuvch264_src.h"
 #endif
 
 #include "gstuvch264_src.h"

-#include "gstuvch264-marshal.h"

 
 #ifndef UVCIOC_XU_FIND_UNIT
 /* Define the needed structure if <linux/uvcvideo.h> is too old.
 
 #ifndef UVCIOC_XU_FIND_UNIT
 /* Define the needed structure if <linux/uvcvideo.h> is too old.


@@ -515,21 +514,19 @@ gst_uvc_h264_src_class_init (GstUvcH264SrcClass * klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_uvc_h264_src_get_enum_setting),
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_uvc_h264_src_get_enum_setting),

-      NULL, NULL, __gst_uvc_h264_marshal_BOOLEAN__STRING_POINTER_POINTER,
+      NULL, NULL, NULL,

       G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, 0);
   _signals[SIGNAL_GET_BOOLEAN_SETTING] =
       g_signal_new_class_handler ("get-boolean-setting",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, 0);
   _signals[SIGNAL_GET_BOOLEAN_SETTING] =
       g_signal_new_class_handler ("get-boolean-setting",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,

-      G_CALLBACK (gst_uvc_h264_src_get_boolean_setting), NULL, NULL,
-      __gst_uvc_h264_marshal_BOOLEAN__STRING_POINTER_POINTER,
+      G_CALLBACK (gst_uvc_h264_src_get_boolean_setting), NULL, NULL, NULL,

       G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, 0);
   _signals[SIGNAL_GET_INT_SETTING] =
       g_signal_new_class_handler ("get-int-setting",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, 0);
   _signals[SIGNAL_GET_INT_SETTING] =
       g_signal_new_class_handler ("get-int-setting",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,

-      G_CALLBACK (gst_uvc_h264_src_get_int_setting), NULL, NULL,
-      __gst_uvc_h264_marshal_BOOLEAN__STRING_POINTER_POINTER_POINTER,
+      G_CALLBACK (gst_uvc_h264_src_get_int_setting), NULL, NULL, NULL,

       G_TYPE_BOOLEAN, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
       G_TYPE_POINTER, 0);
 
       G_TYPE_BOOLEAN, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
       G_TYPE_POINTER, 0);