gst: add some _priv prefixes to private methods

diff --git a/gst/gst.c b/gst/gst.c
index 7445220..22dc73e 100644 (file)
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -666,10 +666,10 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
 
   _priv_gst_quarks_initialize ();
   _gst_memory_init ();
-  _gst_format_initialize ();
-  _gst_query_initialize ();
-  _gst_structure_initialize ();
-  _gst_caps_initialize ();
+  _priv_gst_format_initialize ();
+  _priv_gst_query_initialize ();
+  _priv_gst_structure_initialize ();
+  _priv_gst_caps_initialize ();
   _gst_meta_init ();
 
   g_type_class_ref (gst_object_get_type ());
@@ -759,16 +759,16 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
   g_type_class_ref (gst_probe_return_get_type ());
   g_type_class_ref (gst_segment_flags_get_type ());
 
-  _gst_event_initialize ();
-  _gst_buffer_initialize ();
-  _gst_message_initialize ();
-  _gst_buffer_list_initialize ();
-  _gst_value_initialize ();
+  _priv_gst_event_initialize ();
+  _priv_gst_buffer_initialize ();
+  _priv_gst_message_initialize ();
+  _priv_gst_buffer_list_initialize ();
+  _priv_gst_value_initialize ();
   g_type_class_ref (gst_param_spec_fraction_get_type ());
-  _gst_tag_initialize ();
+  _priv_gst_tag_initialize ();
   gst_parse_context_get_type ();
 
-  _gst_plugin_initialize ();
+  _priv_gst_plugin_initialize ();
 
   gst_g_error_get_type ();
 

diff --git a/gst/gst_private.h b/gst/gst_private.h
index b318abb..1df19b2 100644 (file)
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -91,25 +91,19 @@ gboolean _priv_plugin_deps_files_changed (GstPlugin * plugin);
 
 gboolean _priv_gst_in_valgrind (void);
 
-/* Initialize GStreamer private quark storage */
-void _priv_gst_quarks_initialize (void);
-
-/* Other init functions called from gst_init().
- * FIXME 0.11: rename to _priv_gst_foo_init() so they don't get exported
- * (can't do this now because these functions used to be in our public
- * headers, so at least the symbols need to continue to be available unless
- * we want enterprise edition packagers dancing on our heads) */
-void  _gst_buffer_initialize (void);
-void  _gst_buffer_list_initialize (void);
-void  _gst_structure_initialize (void);
-void  _gst_caps_initialize (void);
-void  _gst_event_initialize (void);
-void  _gst_format_initialize (void);
-void  _gst_message_initialize (void);
-void  _gst_plugin_initialize (void);
-void  _gst_query_initialize (void);
-void  _gst_tag_initialize (void);
-void  _gst_value_initialize (void);
+/* init functions called from gst_init(). */
+void  _priv_gst_quarks_initialize (void);
+void  _priv_gst_buffer_initialize (void);
+void  _priv_gst_buffer_list_initialize (void);
+void  _priv_gst_structure_initialize (void);
+void  _priv_gst_caps_initialize (void);
+void  _priv_gst_event_initialize (void);
+void  _priv_gst_format_initialize (void);
+void  _priv_gst_message_initialize (void);
+void  _priv_gst_plugin_initialize (void);
+void  _priv_gst_query_initialize (void);
+void  _priv_gst_tag_initialize (void);
+void  _priv_gst_value_initialize (void);
 
 /* Private registry functions */
 gboolean _priv_gst_registry_remove_cache_plugins (GstRegistry *registry);
@@ -126,9 +120,8 @@ void _priv_gst_element_state_changed (GstElement *element, GstState oldstate,
 gboolean  priv_gst_structure_append_to_gstring (const GstStructure * structure,
                                                 GString            * s);
 /* registry cache backends */
-/* FIXME 0.11: use priv_ prefix */
-gboolean               gst_registry_binary_read_cache  (GstRegistry * registry, const char *location);
-gboolean               gst_registry_binary_write_cache (GstRegistry * registry, const char *location);
+gboolean               priv_gst_registry_binary_read_cache     (GstRegistry * registry, const char *location);
+gboolean               priv_gst_registry_binary_write_cache    (GstRegistry * registry, const char *location);
 
 /* used in gstvalue.c and gststructure.c */
 #define GST_ASCII_IS_STRING(c) (g_ascii_isalnum((c)) || ((c) == '_') || \

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index eda17c1..c08dedf 100644 (file)
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -224,7 +224,7 @@ _memory_add (GstBuffer * buffer, guint idx, GstMemory * mem)
 }
 
 void
-_gst_buffer_initialize (void)
+_priv_gst_buffer_initialize (void)
 {
   if (G_LIKELY (_gst_buffer_type == 0)) {
     _gst_buffer_type = gst_mini_object_register ("GstBuffer");

diff --git a/gst/gstbufferlist.c b/gst/gstbufferlist.c
index 42690f9..5b477d8 100644 (file)
--- a/gst/gstbufferlist.c
+++ b/gst/gstbufferlist.c
@@ -55,7 +55,7 @@ struct _GstBufferList
 GType _gst_buffer_list_type = 0;
 
 void
-_gst_buffer_list_initialize (void)
+_priv_gst_buffer_list_initialize (void)
 {
   if (G_LIKELY (_gst_buffer_list_type == 0)) {
     _gst_buffer_list_type = gst_mini_object_register ("GstBufferList");

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index db4e067..bb7e800 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -116,7 +116,7 @@ static gboolean gst_caps_from_string_inplace (GstCaps * caps,
 GType _gst_caps_type = 0;
 
 void
-_gst_caps_initialize (void)
+_priv_gst_caps_initialize (void)
 {
   _gst_caps_type = gst_mini_object_register ("GstCaps");
 

diff --git a/gst/gstevent.c b/gst/gstevent.c
index 2b88751..aa71e7a 100644 (file)
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -129,7 +129,7 @@ static GstEventQuarks event_quarks[] = {
 };
 
 void
-_gst_event_initialize (void)
+_priv_gst_event_initialize (void)
 {
   gint i;
 

diff --git a/gst/gstformat.c b/gst/gstformat.c
index 1664ba8..24c3d0f 100644 (file)
--- a/gst/gstformat.c
+++ b/gst/gstformat.c
@@ -53,7 +53,7 @@ static GstFormatDefinition standard_definitions[] = {
 };
 
 void
-_gst_format_initialize (void)
+_priv_gst_format_initialize (void)
 {
   GstFormatDefinition *standards = standard_definitions;
 

diff --git a/gst/gstmessage.c b/gst/gstmessage.c
index 47cf602..1aa2af1 100644 (file)
--- a/gst/gstmessage.c
+++ b/gst/gstmessage.c
@@ -110,7 +110,7 @@ static GstMessageQuarks message_quarks[] = {
 };
 
 void
-_gst_message_initialize (void)
+_priv_gst_message_initialize (void)
 {
   gint i;
 

diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 68c4d2d..dd5d120 100644 (file)
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -298,7 +298,7 @@ gst_plugin_register_static_full (gint major_version, gint minor_version,
 }
 
 void
-_gst_plugin_initialize (void)
+_priv_gst_plugin_initialize (void)
 {
   const gchar *whitelist;
   guint i;

diff --git a/gst/gstquery.c b/gst/gstquery.c
index e398e15..e61b54f 100644 (file)
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
@@ -109,7 +109,7 @@ static GstQueryTypeDefinition standard_definitions[] = {
 };
 
 void
-_gst_query_initialize (void)
+_priv_gst_query_initialize (void)
 {
   GstQueryTypeDefinition *standards = standard_definitions;
 

diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 6930096..442fe80 100644 (file)
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -1571,7 +1571,7 @@ scan_and_update_registry (GstRegistry * default_registry,
   }
 
   GST_INFO ("Registry cache changed. Writing new registry cache");
-  if (!gst_registry_binary_write_cache (default_registry, registry_file)) {
+  if (!priv_gst_registry_binary_write_cache (default_registry, registry_file)) {
     g_set_error (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
         _("Error writing registry cache to %s: %s"),
         registry_file, g_strerror (errno));
@@ -1600,7 +1600,7 @@ ensure_current_registry (GError ** error)
 
   if (!_gst_disable_registry_cache) {
     GST_INFO ("reading registry cache: %s", registry_file);
-    have_cache = gst_registry_binary_read_cache (default_registry,
+    have_cache = priv_gst_registry_binary_read_cache (default_registry,
         registry_file);
     /* Only ever read the registry cache once, then disable it for
      * subsequent updates during the program lifetime */

diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index ac33965..85648be 100644 (file)
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -353,7 +353,8 @@ gst_registry_binary_initialize_magic (GstBinaryRegistryMagic * m)
  * Returns: %TRUE on success.
  */
 gboolean
-gst_registry_binary_write_cache (GstRegistry * registry, const char *location)
+priv_gst_registry_binary_write_cache (GstRegistry * registry,
+    const char *location)
 {
   GList *walk;
   GstBinaryRegistryMagic magic;
@@ -503,7 +504,8 @@ fail:
  * Returns: %TRUE on success.
  */
 gboolean
-gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
+priv_gst_registry_binary_read_cache (GstRegistry * registry,
+    const char *location)
 {
   GMappedFile *mapped = NULL;
   gchar *contents = NULL;

diff --git a/gst/gststructure.c b/gst/gststructure.c
index 3462bae..08c0035 100644 (file)
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -114,7 +114,7 @@ static gboolean gst_structure_parse_simple_string (gchar * s, gchar ** end);
 GType _gst_structure_type = 0;
 
 void
-_gst_structure_initialize (void)
+_priv_gst_structure_initialize (void)
 {
   _gst_structure_type = g_boxed_type_register_static ("GstStructure",
       (GBoxedCopyFunc) gst_structure_copy_conditional,

diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index 29c8ee8..b62fbc7 100644 (file)
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -89,7 +89,7 @@ gst_tag_list_get_type (void)
 }
 
 void
-_gst_tag_initialize (void)
+_priv_gst_tag_initialize (void)
 {
   __tag_mutex = g_mutex_new ();
   __tags = g_hash_table_new (g_direct_hash, g_direct_equal);

diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index e3f404d..098a9cd 100644 (file)
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -4689,7 +4689,7 @@ gst_date_time_get_type (void)
 
 
 void
-_gst_value_initialize (void)
+_priv_gst_value_initialize (void)
 {
   gst_value_table = g_array_new (FALSE, FALSE, sizeof (GstValueTable));
   gst_value_hash = g_hash_table_new (NULL, NULL);

diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index ebf4c41..7ba548a 100644 (file)
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -33,7 +33,6 @@ EXPORTS
        __gst_debug_enabled DATA
        __gst_debug_min DATA
        _gst_alloc_trace_register
-       _gst_buffer_list_initialize
        _gst_buffer_list_type DATA
        _gst_buffer_type DATA
        _gst_caps_type DATA
@@ -912,8 +911,6 @@ EXPORTS
        gst_registry_add_feature
        gst_registry_add_path
        gst_registry_add_plugin
-       gst_registry_binary_read_cache
-       gst_registry_binary_write_cache
        gst_registry_feature_filter
        gst_registry_find_feature
        gst_registry_find_plugin