diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-09-10 16:12:39 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2012-09-10 16:12:39 -0400 |
| commit | cfc94b8a45f21aec8c4d2c20bfa81fddad8d4e70 (patch) | |
| tree | 07b2f6fa25fabc476c71ec3b25b667ede1ebca3e /sys | |
| parent | 1ba24e1306dd1623bae3400e12e073c9f6fc8d51 (diff) | |
| download | gstreamer-plugins-bad-cfc94b8a45f21aec8c4d2c20bfa81fddad8d4e70.tar.gz | |
uvch264src: Use generic marshaller
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/uvch264/Makefile.am | 14 | ||||
| -rw-r--r-- | sys/uvch264/gstuvch264-marshal.list | 3 | ||||
| -rw-r--r-- | sys/uvch264/gstuvch264_src.c | 9 |
3 files changed, 3 insertions, 23 deletions
diff --git a/sys/uvch264/Makefile.am b/sys/uvch264/Makefile.am index 8ecff113f..a647fa998 100644 --- a/sys/uvch264/Makefile.am +++ b/sys/uvch264/Makefile.am @@ -1,18 +1,6 @@ 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 \ @@ -20,8 +8,6 @@ libgstuvch264_la_SOURCES = gstuvch264.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) \ diff --git a/sys/uvch264/gstuvch264-marshal.list b/sys/uvch264/gstuvch264-marshal.list deleted file mode 100644 index a9ec0dd26..000000000 --- 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 69555d3e1..21b6c8c15 100644 --- a/sys/uvch264/gstuvch264_src.c +++ b/sys/uvch264/gstuvch264_src.c @@ -64,7 +64,6 @@ typedef struct #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. @@ -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), - 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_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_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); |