Commit 45ae5321 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

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.
parent c85e958c
...@@ -10,8 +10,8 @@ headers_pbutils = \ ...@@ -10,8 +10,8 @@ headers_pbutils = \
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_headers = $(headers_pbutils) glib_enum_headers = $(headers_pbutils)
glib_enum_define = GST_INSTALL glib_enum_define = PB_UTILS
glib_gen_prefix = gst_install glib_gen_prefix = pbutils
glib_gen_basename = pbutils glib_gen_basename = pbutils
built_headers_configure = \ built_headers_configure = \
...@@ -36,9 +36,9 @@ libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ ...@@ -36,9 +36,9 @@ libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \
$(headers_pbutils) $(headers_pbutils)
nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \
$(built_headers_configure) \ $(built_headers_configure) \
pbutils-enumtypes.h \ pbutils-enumtypes.h
pbutils-marshal.h
noinst_HEADERS = \ noinst_HEADERS = \
pbutils-marshal.h \
pbutils-private.h pbutils-private.h
EXTRA_DIST = pbutils-marshal.list EXTRA_DIST = pbutils-marshal.list
......
...@@ -222,7 +222,7 @@ gst_discoverer_class_init (GstDiscovererClass * klass) ...@@ -222,7 +222,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, 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); G_TYPE_NONE, 2, GST_TYPE_DISCOVERER_INFO, GST_TYPE_G_ERROR);
} }
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <gst/pbutils/install-plugins.h> #include <gst/pbutils/install-plugins.h>
#include <gst/pbutils/codec-utils.h> #include <gst/pbutils/codec-utils.h>
#include <gst/pbutils/pbutils-enumtypes.h> #include <gst/pbutils/pbutils-enumtypes.h>
#include <gst/pbutils/pbutils-marshal.h>
#include <gst/pbutils/gstdiscoverer.h> #include <gst/pbutils/gstdiscoverer.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -57,7 +57,6 @@ EXPORTS ...@@ -57,7 +57,6 @@ EXPORTS
gst_discoverer_video_info_get_par_num gst_discoverer_video_info_get_par_num
gst_discoverer_video_info_get_type gst_discoverer_video_info_get_type
gst_discoverer_video_info_get_width gst_discoverer_video_info_get_width
gst_install_marshal_VOID__POINTER_BOXED
gst_install_plugins_async gst_install_plugins_async
gst_install_plugins_context_free gst_install_plugins_context_free
gst_install_plugins_context_get_type gst_install_plugins_context_get_type
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment