diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-10-15 19:18:12 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-10-15 19:58:04 +0100 |
| commit | 45ae5321621d63662c428980400f597213f32768 (patch) | |
| tree | 9ffdb886cc771741535759ba683a857053707f7d /gst-libs | |
| parent | c85e958c7c862aae5059c83b07b20ff0278c4b89 (diff) | |
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.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/pbutils/Makefile.am | 8 | ||||
| -rw-r--r-- | gst-libs/gst/pbutils/gstdiscoverer.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/pbutils/pbutils.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 91754f7e9..50f65c171 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 eb04f3a9f..06ef5f47f 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 5fabf010c..19b1d1f09 100644 --- a/gst-libs/gst/pbutils/pbutils.h +++ b/gst-libs/gst/pbutils/pbutils.h @@ -28,7 +28,6 @@ #include <gst/pbutils/install-plugins.h> #include <gst/pbutils/codec-utils.h> #include <gst/pbutils/pbutils-enumtypes.h> -#include <gst/pbutils/pbutils-marshal.h> #include <gst/pbutils/gstdiscoverer.h> G_BEGIN_DECLS |