Commit 41455989 authored by Wim Taymans's avatar Wim Taymans

gst: add some _priv prefixes to private methods

parent 1e59b651
......@@ -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 ();
......
......@@ -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) == '_') || \
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -129,7 +129,7 @@ static GstEventQuarks event_quarks[] = {
};
void
_gst_event_initialize (void)
_priv_gst_event_initialize (void)
{
gint i;
......
......@@ -53,7 +53,7 @@ static GstFormatDefinition standard_definitions[] = {
};
void
_gst_format_initialize (void)
_priv_gst_format_initialize (void)
{
GstFormatDefinition *standards = standard_definitions;
......
......@@ -110,7 +110,7 @@ static GstMessageQuarks message_quarks[] = {
};
void
_gst_message_initialize (void)
_priv_gst_message_initialize (void)
{
gint i;
......
......@@ -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;
......
......@@ -109,7 +109,7 @@ static GstQueryTypeDefinition standard_definitions[] = {
};
void
_gst_query_initialize (void)
_priv_gst_query_initialize (void)
{
GstQueryTypeDefinition *standards = standard_definitions;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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,
......
......@@ -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);
......
......@@ -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);
......
......@@ -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
......
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