From ac320f6bcc37a5acd80f5ea05cc35c0ab5832c64 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 23 Sep 2002 08:36:05 +0000 Subject: [PATCH] some debug additions and doc fixes Original commit message from CVS: some debug additions and doc fixes --- gst/gstcaps.c | 2 +- gst/gstplugin.c | 16 ++++++++++++++-- gst/registries/gstxmlregistry.c | 6 ++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/gst/gstcaps.c b/gst/gstcaps.c index f7ed76720b..d86d1d5ac2 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -106,7 +106,7 @@ get_type_for_mime (const gchar *mime) * @mime: the mime type to attach to the capability * @props: the properties to add to this capability * - * Create a new capability with the given mime typei and properties. + * Create a new capability with the given mime type and properties. * * Returns: a new capability */ diff --git a/gst/gstplugin.c b/gst/gstplugin.c index e80cb0d65f..3e65620e9c 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -433,11 +433,23 @@ gboolean gst_plugin_load (const gchar *name) { GstPlugin *plugin; + GError *error = NULL; plugin = gst_registry_pool_find_plugin (name); if (plugin) - return gst_plugin_load_plugin (plugin, NULL); + { + gboolean result = gst_plugin_load_plugin (plugin, &error); + if (error) + { + GST_DEBUG (GST_CAT_PLUGIN_LOADING, "load_plugin error: %s\n", + error->message); + g_error_free (error); + } + return result; + } + GST_DEBUG (GST_CAT_PLUGIN_LOADING, "Could not find %s in registry pool", + name); return FALSE; } @@ -456,7 +468,7 @@ gst_library_load (const gchar *name) gboolean res; /* for now this is the same */ - res = gst_plugin_load(name); + res = gst_plugin_load (name); return res; } diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c index 83b79c3e13..8066adbfe5 100644 --- a/gst/registries/gstxmlregistry.c +++ b/gst/registries/gstxmlregistry.c @@ -377,7 +377,8 @@ gst_xml_registry_add_path_list_func (GstXMLRegistry *registry) gssize size; GError *error = NULL; - context = g_markup_parse_context_new (&gst_xml_registry_paths_parser, 0, registry, NULL); + context = g_markup_parse_context_new (&gst_xml_registry_paths_parser, 0, + registry, NULL); if (! (reg = fopen (registry->location, "r"))) { return; @@ -392,7 +393,8 @@ gst_xml_registry_add_path_list_func (GstXMLRegistry *registry) g_markup_parse_context_parse (context, text, size, &error); if (error) { - fprintf(stderr, "ERROR: parsing registry: %s\n", error->message); + fprintf (stderr, "ERROR: parsing registry %s: %s\n", + registry->location, error->message); g_free (text); fclose (reg); return;