mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

pbutils: use generic marshaller for discoverer's "discovered" signal

Browse source 
If this change causes build issues, run git clean -x -d -f; ./autogen.sh
This commit is contained in:
Tim-Philipp Müller 2012-08-04 23:29:27 +01:00
parent 452b38560c
commit 284f96765c
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/pbutils/Makefile.am
View file

@ -32,8 +32,7 @@ libgstpbutils_@GST_API_VERSION@_la_SOURCES = \
gstdiscoverer-types.c gstdiscoverer-types.c
nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES = \ nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES = \
pbutils-enumtypes.c \ pbutils-enumtypes.c
pbutils-marshal.c
libgstpbutils_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/pbutils libgstpbutils_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/pbutils
libgstpbutils_@GST_API_VERSION@include_HEADERS = \ libgstpbutils_@GST_API_VERSION@include_HEADERS = \
@ -43,7 +42,6 @@ nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS = \
pbutils-enumtypes.h pbutils-enumtypes.h
noinst_HEADERS = \ noinst_HEADERS = \
pbutils-private.h pbutils-private.h
EXTRA_DIST = pbutils-marshal.list
libgstpbutils_@GST_API_VERSION@_la_LIBADD = \ libgstpbutils_@GST_API_VERSION@_la_LIBADD = \
$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
@ -54,9 +52,7 @@ libgstpbutils_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAG
BUILT_SOURCES = \ BUILT_SOURCES = \
pbutils-enumtypes.c \ pbutils-enumtypes.c \
pbutils-enumtypes.h \ pbutils-enumtypes.h
pbutils-marshal.c \
pbutils-marshal.h
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)

7
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -45,7 +45,6 @@
#include <gst/video/video.h> #include <gst/video/video.h>
#include "pbutils.h" #include "pbutils.h"
#include "pbutils-marshal.h"
#include "pbutils-private.h" #include "pbutils-private.h"
#include "gst/glib-compat-private.h" #include "gst/glib-compat-private.h"
@ -241,7 +240,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass)
gst_discoverer_signals[SIGNAL_DISCOVERED] = gst_discoverer_signals[SIGNAL_DISCOVERED] =
g_signal_new ("discovered", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("discovered", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstDiscovererClass, discovered), G_STRUCT_OFFSET (GstDiscovererClass, discovered),
NULL, NULL, pbutils_marshal_VOID__POINTER_BOXED, NULL, NULL, g_cclosure_marshal_generic,
G_TYPE_NONE, 2, GST_TYPE_DISCOVERER_INFO, G_TYPE_NONE, 2, GST_TYPE_DISCOVERER_INFO,
G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE); G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
} }
@ -1167,8 +1166,8 @@ discoverer_collect (GstDiscoverer * dc)
gst_caps_get_structure (dc->priv->current_info->stream_info->caps, 0); gst_caps_get_structure (dc->priv->current_info->stream_info->caps, 0);
if (g_str_has_prefix (gst_structure_get_name (st), "image/")) if (g_str_has_prefix (gst_structure_get_name (st), "image/"))
((GstDiscovererVideoInfo *) dc->priv->current_info->stream_info)-> ((GstDiscovererVideoInfo *) dc->priv->current_info->
is_image = TRUE; stream_info)->is_image = TRUE;
} }
} }

2
gst-libs/gst/pbutils/pbutils-marshal.list
View file

@ -1,2 +0,0 @@
# pbutils marshallers
VOID:POINTER,BOXED