registry: small cleanups and use object log variants more

This commit is contained in:
Stefan Sauer 2013-10-25 21:29:01 +02:00
parent 1e58699376
commit a6f60fcf2e

View file

@ -227,7 +227,7 @@ G_STMT_START { \
static gboolean static gboolean
gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature) gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
{ {
const gchar *type_name = g_type_name (G_OBJECT_TYPE (feature)); const gchar *type_name = G_OBJECT_TYPE_NAME (feature);
GstRegistryChunkPluginFeature *pf = NULL; GstRegistryChunkPluginFeature *pf = NULL;
GstRegistryChunk *chk = NULL; GstRegistryChunk *chk = NULL;
GList *walk; GList *walk;
@ -256,8 +256,8 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
walk = g_list_next (walk), ef->ninterfaces++) { walk = g_list_next (walk), ef->ninterfaces++) {
gst_registry_chunks_save_const_string (list, (gchar *) walk->data); gst_registry_chunks_save_const_string (list, (gchar *) walk->data);
} }
GST_DEBUG ("Feature %s: saved %d interfaces %d pad templates", GST_DEBUG_OBJECT (feature, "saved %d interfaces %d pad templates",
GST_OBJECT_NAME (feature), ef->ninterfaces, ef->npadtemplates); ef->ninterfaces, ef->npadtemplates);
/* save uritypes */ /* save uritypes */
if (GST_URI_TYPE_IS_VALID (factory->uri_type)) { if (GST_URI_TYPE_IS_VALID (factory->uri_type)) {
@ -276,7 +276,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
ef->nuriprotocols++; ef->nuriprotocols++;
} }
*list = g_list_prepend (*list, subchk); *list = g_list_prepend (*list, subchk);
GST_DEBUG ("Saved %d UriTypes", ef->nuriprotocols); GST_DEBUG_OBJECT (feature, "Saved %d UriTypes", ef->nuriprotocols);
} else { } else {
g_warning ("GStreamer feature '%s' is URI handler but does not provide" g_warning ("GStreamer feature '%s' is URI handler but does not provide"
" any protocols it can handle", GST_OBJECT_NAME (feature)); " any protocols it can handle", GST_OBJECT_NAME (feature));
@ -289,7 +289,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
GstStaticPadTemplate *template = walk->data; GstStaticPadTemplate *template = walk->data;
if (!gst_registry_chunks_save_pad_template (list, template)) { if (!gst_registry_chunks_save_pad_template (list, template)) {
GST_ERROR ("Can't fill pad template, aborting."); GST_ERROR_OBJECT (feature, "Can't fill pad template, aborting.");
goto fail; goto fail;
} }
} }
@ -318,6 +318,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
factory->extensions[tff->nextensions++]); factory->extensions[tff->nextensions++]);
} }
} }
GST_DEBUG_OBJECT (feature, "saved %d extensions", tff->nextensions);
/* save caps */ /* save caps */
if (factory->caps) { if (factory->caps) {
GstCaps *fcaps = gst_caps_ref (factory->caps); GstCaps *fcaps = gst_caps_ref (factory->caps);
@ -332,7 +333,7 @@ gst_registry_chunks_save_feature (GList ** list, GstPluginFeature * feature)
gst_registry_chunks_save_const_string (list, ""); gst_registry_chunks_save_const_string (list, "");
} }
} else { } else {
GST_WARNING ("unhandled feature type '%s'", type_name); GST_WARNING_OBJECT (feature, "unhandled feature type '%s'", type_name);
} }
if (pf) { if (pf) {