projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ee5207
)
tools: don't use private GstElementFactory API in gst-inspect
author
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sat, 19 May 2012 13:59:14 +0000
(14:59 +0100)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sat, 19 May 2012 13:59:14 +0000
(14:59 +0100)
tools/gst-inspect.c
patch
|
blob
|
history
diff --git
a/tools/gst-inspect.c
b/tools/gst-inspect.c
index
a8000e7
..
cd622d6
100644
(file)
--- a/
tools/gst-inspect.c
+++ b/
tools/gst-inspect.c
@@
-181,31
+181,29
@@
get_rank_name (char *s, gint rank)
return s;
}
return s;
}
-static gboolean
-print_factory_details_metadata (GQuark field_id, const GValue * value,
- gpointer user_data)
-{
- gchar *val = g_strdup_value_contents (value);
- gchar *key = g_strdup (g_quark_to_string (field_id));
-
- key[0] = g_ascii_toupper (key[0]);
- n_print (" %s:\t\t%s\n", key, val);
- g_free (val);
- g_free (key);
- return TRUE;
-}
-
static void
print_factory_details_info (GstElementFactory * factory)
{
static void
print_factory_details_info (GstElementFactory * factory)
{
+ gchar **keys, **k;
char s[20];
n_print ("Factory Details:\n");
n_print (" Rank:\t\t%s (%d)\n",
get_rank_name (s, GST_PLUGIN_FEATURE (factory)->rank),
GST_PLUGIN_FEATURE (factory)->rank);
char s[20];
n_print ("Factory Details:\n");
n_print (" Rank:\t\t%s (%d)\n",
get_rank_name (s, GST_PLUGIN_FEATURE (factory)->rank),
GST_PLUGIN_FEATURE (factory)->rank);
- gst_structure_foreach ((GstStructure *) factory->metadata,
- print_factory_details_metadata, NULL);
+
+ keys = gst_element_factory_get_metadata_keys (factory);
+ if (keys != NULL) {
+ for (k = keys; *k != NULL; ++k) {
+ const gchar *val;
+ gchar *key = *k;
+
+ val = gst_element_factory_get_metadata (factory, key);
+ key[0] = g_ascii_toupper (key[0]);
+ n_print (" %s:\t\t%s\n", key, val);
+ }
+ g_strfreev (keys);
+ }
n_print ("\n");
}
n_print ("\n");
}
@@
-591,14
+589,14
@@
print_pad_templates_info (GstElement * element, GstElementFactory * factory)
GstStaticPadTemplate *padtemplate;
n_print ("Pad Templates:\n");
GstStaticPadTemplate *padtemplate;
n_print ("Pad Templates:\n");
- if (
!factory->numpadtemplates
) {
+ if (
gst_element_factory_get_num_pad_templates (factory) == 0
) {
n_print (" none\n");
return;
}
gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
n_print (" none\n");
return;
}
gstelement_class = GST_ELEMENT_CLASS (G_OBJECT_GET_CLASS (element));
- pads =
factory->staticpadtemplates
;
+ pads =
gst_element_factory_get_static_pad_templates (factory)
;
while (pads) {
padtemplate = (GstStaticPadTemplate *) (pads->data);
pads = g_list_next (pads);
while (pads) {
padtemplate = (GstStaticPadTemplate *) (pads->data);
pads = g_list_next (pads);