add debugging fix comment blocks fix some -libs doc errors

Original commit message from CVS:
add debugging
fix comment blocks
fix some -libs doc errors

diff --git a/ChangeLog b/ChangeLog
index 9243eab..0ff2806 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * docs/libs/gstreamer-libs-sections.txt:
+          remove </SUBSECTION>
+       * gst/gstplugin.c:
+       * gst/gstregistry.c: (gst_registry_add_plugin):
+       * gst/registries/gstxmlregistry.c: (gst_xml_registry_get_type),
+       (gst_xml_registry_open_func), (gst_xml_registry_close_func):
+          add debugging and fix some comment blocks
+
 2004-03-15  Johan Dahlin  <johan@gnome.org>
 
        * *.h: Revert indent changes.

diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 32d00bc..d4754e3 100644 (file)
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -2,19 +2,20 @@
 GstXML
 
 <!-- ##### SECTION Short_Description ##### -->
-Convert Elements into an XML presentation.
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-All GstElements can be serialized to an XML presentation and subsequently loaded back.
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### FUNCTION gst_xml_new ##### -->
 <para>
 

diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 6294ace..4679db9 100644 (file)
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -165,11 +165,9 @@ gst_dpman_set_mode
 gst_dpman_set_parent
 gst_dpman_get_manager
 gst_dpman_bypass_dparam
-</SUBSECTION>
 <SUBSECTION Dynamic Parameters>
 gst_dparam_new
 gst_dparam_attach
 gst_dparam_detach
 gst_dparam_do_update_default
-</SUBSECTION>
 </SECTION>

diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index b95af49..79d76a1 100644 (file)
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -36,11 +36,7 @@
 #include "gstfilter.h"
 
 
-#ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
-#else
-#define GST_CAT_DEFAULT 0
-#endif
 
 static GModule *main_module = NULL;
 static GList *_gst_plugin_static = NULL;
@@ -624,7 +620,8 @@ typedef struct
   gboolean first;
   gpointer user_data;
   GList *result;
-} FeatureFilterData;
+}
+FeatureFilterData;
 
 static gboolean
 _feature_filter (GstPlugin * plugin, gpointer user_data)

diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 3b1329f..4455793 100644 (file)
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -3,7 +3,7 @@
  *                    2000 Wim Taymans <wtay@chello.be>
  *
  * gstregistry.c: handle registry
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -67,6 +67,7 @@ gst_registry_get_type (void)
       (GInstanceInitFunc) gst_registry_init,
       NULL
     };
+
     registry_type = g_type_register_static (G_TYPE_OBJECT, "GstRegistry",
        &registry_info, G_TYPE_FLAG_ABSTRACT);
   }
@@ -209,7 +210,7 @@ gst_registry_unload (GstRegistry * registry)
 /**
  * gst_registry_add_path:
  * @registry: the registry to add the path to
- * @path: the path to add to the registry 
+ * @path: the path to add to the registry
  *
  * Add the given path to the registry. The syntax of the
  * path is specific to the registry. If the path has already been
@@ -268,8 +269,7 @@ gst_registry_clear_paths (GstRegistry * registry)
  * @registry: the registry to add the plugin to
  * @plugin: the plugin to add
  *
- * Add the plugin to the registry. The plugin-added signal 
- * will be emitted.
+ * Add the plugin to the registry. The plugin-added signal will be emitted.
  *
  * Returns: TRUE on success.
  */
@@ -281,6 +281,7 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin)
   plugin->manager = registry;
   registry->plugins = g_list_prepend (registry->plugins, plugin);
 
+  GST_DEBUG ("emitting plugin-added for filename %s", plugin->filename);
   g_signal_emit (G_OBJECT (registry), gst_registry_signals[PLUGIN_ADDED], 0,
       plugin);
 
@@ -310,7 +311,7 @@ gst_registry_remove_plugin (GstRegistry * registry, GstPlugin * plugin)
  * @user_data: user data passed to the filter function
  *
  * Runs a filter against all plugins in the registry and returns a GList with
- * the results. If the first flag is set, only the first match is 
+ * the results. If the first flag is set, only the first match is
  * returned (as a list with a single object).
  *
  * Returns: a GList of plugins, g_list_free after use.
@@ -332,9 +333,9 @@ gst_registry_plugin_filter (GstRegistry * registry,
  * @first: only return first match
  * @user_data: user data passed to the filter function
  *
- * Runs a filter against all features of the plugins in the registry 
- * and returns a GList with the results. 
- * If the first flag is set, only the first match is 
+ * Runs a filter against all features of the plugins in the registry
+ * and returns a GList with the results.
+ * If the first flag is set, only the first match is
  * returned (as a list with a single object).
  *
  * Returns: a GList of plugin features, g_list_free after use.
@@ -385,7 +386,7 @@ gst_registry_find_plugin (GstRegistry * registry, const gchar * name)
  *
  * Find the pluginfeature with the given name and type in the registry.
  *
- * Returns: The pluginfeature with the given name and type or NULL 
+ * Returns: The pluginfeature with the given name and type or NULL
  * if the plugin was not found.
  */
 GstPluginFeature *
@@ -422,7 +423,7 @@ gst_registry_find_feature (GstRegistry * registry, const gchar * name,
  *
  * Bring the plugin from the registry into memory.
  *
- * Returns: a value indicating the result 
+ * Returns: a value indicating the result
  */
 GstRegistryReturn
 gst_registry_load_plugin (GstRegistry * registry, GstPlugin * plugin)
@@ -447,7 +448,7 @@ gst_registry_load_plugin (GstRegistry * registry, GstPlugin * plugin)
  *
  * Unload the plugin from the given registry.
  *
- * Returns: a value indicating the result 
+ * Returns: a value indicating the result
  */
 GstRegistryReturn
 gst_registry_unload_plugin (GstRegistry * registry, GstPlugin * plugin)
@@ -472,7 +473,7 @@ gst_registry_unload_plugin (GstRegistry * registry, GstPlugin * plugin)
  *
  * Update the plugin in the given registry.
  *
- * Returns: a value indicating the result 
+ * Returns: a value indicating the result
  */
 GstRegistryReturn
 gst_registry_update_plugin (GstRegistry * registry, GstPlugin * plugin)

diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c
index b491bba..6f0da4f 100644 (file)
--- a/gst/registries/gstxmlregistry.c
+++ b/gst/registries/gstxmlregistry.c
@@ -476,6 +476,7 @@ gst_xml_registry_open_func (GstXMLRegistry * registry, GstXMLRegistryMode mode)
 
   gst_registry = GST_REGISTRY (registry);
   paths = gst_registry->paths;
+  GST_CAT_DEBUG (GST_CAT_GST_INIT, "opening registry %s", registry->location);
 
   g_return_val_if_fail (registry->open == FALSE, FALSE);
 
@@ -515,16 +516,20 @@ gst_xml_registry_open_func (GstXMLRegistry * registry, GstXMLRegistryMode mode)
          return FALSE;
        }
       } else {
-       GST_CAT_INFO (GST_CAT_PLUGIN_LOADING,
+       GST_CAT_INFO (GST_CAT_GST_INIT,
            "Can't write to this registry and it's out of date, ignoring it");
        return FALSE;
       }
     }
 
+    GST_CAT_DEBUG (GST_CAT_GST_INIT, "opening registry %s for reading",
+       registry->location);
     registry->regfile = fopen (registry->location, "r");
   } else if (mode == GST_XML_REGISTRY_WRITE) {
     g_return_val_if_fail (gst_registry->flags & GST_REGISTRY_WRITABLE, FALSE);
 
+    GST_CAT_DEBUG (GST_CAT_GST_INIT, "opening registry %s for writing",
+       registry->location);
     registry->regfile = fopen (registry->location, "w");
   }
 
@@ -562,6 +567,7 @@ gst_xml_registry_save_func (GstXMLRegistry * registry, gchar * format, ...)
 static gboolean
 gst_xml_registry_close_func (GstXMLRegistry * registry)
 {
+  GST_CAT_DEBUG (GST_CAT_GST_INIT, "closing registry %s", registry->location);
   fclose (registry->regfile);
 
   registry->open = FALSE;