From 45ae5321621d63662c428980400f597213f32768 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 15 Oct 2010 19:18:12 +0100 Subject: [PATCH] pbutils: make marshaller private There's no reason to make the marshaller public API. Don't install pbutils-marshal.h header file and use prefix that makes sure the symbol doesn't get exported. --- gst-libs/gst/pbutils/Makefile.am | 8 ++++---- gst-libs/gst/pbutils/gstdiscoverer.c | 2 +- gst-libs/gst/pbutils/pbutils.h | 1 - win32/common/libgstpbutils.def | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 91754f7..50f65c1 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -10,8 +10,8 @@ headers_pbutils = \ # variables used for enum/marshal generation glib_enum_headers = $(headers_pbutils) -glib_enum_define = GST_INSTALL -glib_gen_prefix = gst_install +glib_enum_define = PB_UTILS +glib_gen_prefix = pbutils glib_gen_basename = pbutils built_headers_configure = \ @@ -36,9 +36,9 @@ libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ $(headers_pbutils) nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ $(built_headers_configure) \ - pbutils-enumtypes.h \ - pbutils-marshal.h + pbutils-enumtypes.h noinst_HEADERS = \ + pbutils-marshal.h \ pbutils-private.h EXTRA_DIST = pbutils-marshal.list diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index eb04f3a..06ef5f4 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -222,7 +222,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, gst_install_marshal_VOID__POINTER_BOXED, + NULL, NULL, pbutils_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, GST_TYPE_DISCOVERER_INFO, GST_TYPE_G_ERROR); } diff --git a/gst-libs/gst/pbutils/pbutils.h b/gst-libs/gst/pbutils/pbutils.h index 5fabf01..19b1d1f 100644 --- a/gst-libs/gst/pbutils/pbutils.h +++ b/gst-libs/gst/pbutils/pbutils.h @@ -28,7 +28,6 @@ #include #include #include -#include #include G_BEGIN_DECLS diff --git a/win32/common/libgstpbutils.def b/win32/common/libgstpbutils.def index 540a9d06..4a07b1d 100644 --- a/win32/common/libgstpbutils.def +++ b/win32/common/libgstpbutils.def @@ -57,7 +57,6 @@ EXPORTS gst_discoverer_video_info_get_par_num gst_discoverer_video_info_get_type gst_discoverer_video_info_get_width - gst_install_marshal_VOID__POINTER_BOXED gst_install_plugins_async gst_install_plugins_context_free gst_install_plugins_context_get_type -- 2.7.4