mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-08 09:04:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

uvch264src: Use generic marshaller

Browse source
This commit is contained in:
Olivier Crête 2012-09-10 16:12:39 -04:00
parent 1ba24e1306
commit cfc94b8a45
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/uvch264/Makefile.am
View file

@ -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) \

3
sys/uvch264/gstuvch264-marshal.list
View file

@ -1,3 +0,0 @@
BOOLEAN:STRING,POINTER,POINTER,POINTER
BOOLEAN:STRING,POINTER,POINTER
BOOLEAN:STRING,POINTER

9
sys/uvch264/gstuvch264_src.c
View file

@ -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);