mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 13:36:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

give an error only at the end (when it couldn't load some plug-ins definitively)

Browse source 
Original commit message from CVS:
give an error only at the end (when it couldn't load some plug-ins
definitively)
This commit is contained in:
Thomas Vander Stichele 2002-09-09 23:28:29 +00:00
parent 45aefbc478
commit 5f562239ea
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gst/registries/gstxmlregistry.c
View file

@ -804,13 +804,16 @@ find_index_for (const gchar *name, const gchar **attribute_names)
} }
static void static void
gst_xml_registry_start_element (GMarkupParseContext *context, const gchar *element_name, gst_xml_registry_start_element (GMarkupParseContext *context,
const gchar **attribute_names, const gchar **attribute_values, const gchar *element_name,
gpointer user_data, GError **error) const gchar **attribute_names,
const gchar **attribute_values,
gpointer user_data, GError **error)
{ {
GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data); GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data);
xmlregistry->open_tags = g_list_prepend (xmlregistry->open_tags, g_strdup (element_name)); xmlregistry->open_tags = g_list_prepend (xmlregistry->open_tags,
g_strdup (element_name));
switch (xmlregistry->state) { switch (xmlregistry->state) {
case GST_XML_REGISTRY_NONE: case GST_XML_REGISTRY_NONE:
@ -822,7 +825,7 @@ gst_xml_registry_start_element (GMarkupParseContext *context, const gchar *eleme
if (!strncmp (element_name, "plugin", 6)) { if (!strncmp (element_name, "plugin", 6)) {
xmlregistry->state = GST_XML_REGISTRY_PLUGIN; xmlregistry->state = GST_XML_REGISTRY_PLUGIN;
xmlregistry->parser = gst_xml_registry_parse_plugin; xmlregistry->parser = gst_xml_registry_parse_plugin;
xmlregistry->current_plugin = (GstPlugin *)g_new0 (GstPlugin, 1); xmlregistry->current_plugin = (GstPlugin *) g_new0 (GstPlugin, 1);
} }
break; break;
case GST_XML_REGISTRY_PLUGIN: case GST_XML_REGISTRY_PLUGIN:
@ -906,7 +909,8 @@ gst_xml_registry_start_element (GMarkupParseContext *context, const gchar *eleme
break; break;
sscanf (attribute_values[index], "%d", &value); sscanf (attribute_values[index], "%d", &value);
gst_props_add_entry (xmlregistry->props, gst_props_add_entry (xmlregistry->props,
gst_props_entry_new (attribute_values[name_index], GST_PROPS_INT (value))); gst_props_entry_new (attribute_values[name_index],
GST_PROPS_INT (value)));
} }
else if (!strncmp (element_name, "range", 5)) { else if (!strncmp (element_name, "range", 5)) {
gint min, max; gint min, max;
@ -982,7 +986,8 @@ gst_xml_registry_start_element (GMarkupParseContext *context, const gchar *eleme
} }
static void static void
gst_xml_registry_end_element (GMarkupParseContext *context, const gchar *element_name, gst_xml_registry_end_element (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data, GError **error) gpointer user_data, GError **error)
{ {
GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data); GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data);
@ -1103,8 +1108,10 @@ gst_xml_registry_error (GMarkupParseContext *context, GError *error,
} }
static void static void
gst_xml_registry_paths_start_element (GMarkupParseContext *context, const gchar *element_name, gst_xml_registry_paths_start_element (GMarkupParseContext *context,
const gchar **attribute_names, const gchar **attribute_values, const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
gpointer user_data, GError **error) gpointer user_data, GError **error)
{ {
GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data); GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data);
@ -1131,7 +1138,8 @@ gst_xml_registry_paths_start_element (GMarkupParseContext *context, const gchar
} }
static void static void
gst_xml_registry_paths_end_element (GMarkupParseContext *context, const gchar *element_name, gst_xml_registry_paths_end_element (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data, GError **error) gpointer user_data, GError **error)
{ {
GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data); GstXMLRegistry *xmlregistry = GST_XML_REGISTRY (user_data);
@ -1176,7 +1184,8 @@ G_STMT_START{ \
}G_STMT_END }G_STMT_END
static gboolean static gboolean
gst_xml_registry_save_props_func (GstPropsEntry *entry, GstXMLRegistry *xmlregistry) gst_xml_registry_save_props_func (GstPropsEntry *entry,
GstXMLRegistry *xmlregistry)
{ {
const gchar *name; const gchar *name;
@ -1447,7 +1456,8 @@ gst_xml_registry_save (GstRegistry *registry)
} }
static GList* static GList*
gst_xml_registry_rebuild_recurse (GstXMLRegistry *registry, const gchar *directory) gst_xml_registry_rebuild_recurse (GstXMLRegistry *registry,
const gchar *directory)
{ {
GDir *dir; GDir *dir;
GList *ret = NULL; GList *ret = NULL;
@ -1497,9 +1507,12 @@ gst_xml_registry_rebuild (GstRegistry *registry)
while (walk) { while (walk) {
gchar *path = (gchar *) walk->data; gchar *path = (gchar *) walk->data;
GST_INFO (GST_CAT_PLUGIN_LOADING, "Rebuilding registry %p in directory %s...", registry, path); GST_INFO (GST_CAT_PLUGIN_LOADING,
"Rebuilding registry %p in directory %s...", registry, path);
plugins = g_list_concat (plugins, gst_xml_registry_rebuild_recurse (xmlregistry, path)); plugins = g_list_concat (plugins,
gst_xml_registry_rebuild_recurse (xmlregistry,
path));
walk = g_list_next (walk); walk = g_list_next (walk);
} }
@ -1532,12 +1545,15 @@ gst_xml_registry_rebuild (GstRegistry *registry)
walk = plugins; walk = plugins;
while (walk) { while (walk) {
if (gst_plugin_load_plugin (GST_PLUGIN (walk->data), &error)) { if (gst_plugin_load_plugin (GST_PLUGIN (walk->data), &error)) {
g_warning ("Bizarre behavior: plugin %s actually loaded", ((GstPlugin*)walk->data)->filename); g_warning ("Bizarre behavior: plugin %s actually loaded",
((GstPlugin *) walk->data)->filename);
} else { } else {
GST_INFO (GST_CAT_PLUGIN_LOADING, "Plugin %s failed to load: %s", GST_INFO (GST_CAT_PLUGIN_LOADING, "Plugin %s failed to load: %s",
((GstPlugin*)walk->data)->filename, error->message); ((GstPlugin *) walk->data)->filename, error->message);
g_print ("Plugin %s failed to load\n",
((GstPlugin *) walk->data)->filename);
g_free (((GstPlugin*)walk->data)->filename); g_free (((GstPlugin *) walk->data)->filename);
g_free (walk->data); g_free (walk->data);
g_error_free (error); g_error_free (error);
error = NULL; error = NULL;