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

If this change causes build issues, run git clean -x -d -f; ./autogen.sh

diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index f2e7c3121b46619c9c721d0285f1747704246d40..4ec3ae62c2e7f502f42e8328619bd2d233a268fc 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -32,8 +32,7 @@ libgstpbutils_@GST_API_VERSION@_la_SOURCES = \
        gstdiscoverer-types.c
 
 nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES = \
-       pbutils-enumtypes.c     \
-       pbutils-marshal.c
+       pbutils-enumtypes.c
 
 libgstpbutils_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/pbutils
 libgstpbutils_@GST_API_VERSION@include_HEADERS = \
@@ -43,7 +42,6 @@ nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS = \
        pbutils-enumtypes.h
 noinst_HEADERS = \
        pbutils-private.h
-EXTRA_DIST = pbutils-marshal.list
 
 libgstpbutils_@GST_API_VERSION@_la_LIBADD = \
   $(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 = \
        pbutils-enumtypes.c \
-       pbutils-enumtypes.h \
-       pbutils-marshal.c   \
-       pbutils-marshal.h
+       pbutils-enumtypes.h
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c
index a0c223441b34599762e5a91c3ec653b180594866..0b53ff483cb6a0ef5a2fdbb324a44a34807450fe 100644 (file)
--- a/gst-libs/gst/pbutils/gstdiscoverer.c
+++ b/gst-libs/gst/pbutils/gstdiscoverer.c
@@ -45,7 +45,6 @@
 #include <gst/video/video.h>
 
 #include "pbutils.h"
-#include "pbutils-marshal.h"
 #include "pbutils-private.h"
 
 #include "gst/glib-compat-private.h"
@@ -241,7 +240,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass)
   gst_discoverer_signals[SIGNAL_DISCOVERED] =
       g_signal_new ("discovered", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
       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_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);
 
       if (g_str_has_prefix (gst_structure_get_name (st), "image/"))
-        ((GstDiscovererVideoInfo *) dc->priv->current_info->stream_info)->
-            is_image = TRUE;
+        ((GstDiscovererVideoInfo *) dc->priv->current_info->
+            stream_info)->is_image = TRUE;
     }
   }
 

diff --git a/gst-libs/gst/pbutils/pbutils-marshal.list b/gst-libs/gst/pbutils/pbutils-marshal.list
deleted file mode 100644 (file)
index f409996..0000000
--- a/gst-libs/gst/pbutils/pbutils-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# pbutils marshallers
-VOID:POINTER,BOXED