index 8da042946..a057cba09 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
-@@ -394,7 +394,7 @@ print_object_properties_info (GObject * obj, GObjectClass * obj_class,
-
- first_flag = TRUE;
- n_print ("%sflags%s: ", PROP_ATTR_NAME_COLOR, RESET_COLOR);
-- readable = ! !(param->flags & G_PARAM_READABLE);
-+ readable = !!(param->flags & G_PARAM_READABLE);
- if (readable && obj != NULL) {
- g_object_get_property (obj, param->name, &value);
- } else {
-@@ -1739,11 +1739,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names)
+@@ -1934,11 +1934,228 @@ print_tracer_info (GstPluginFeature * fe
return 0;
}
{
GstPadDirection direction;
const gchar *type_name;
-@@ -1769,6 +1986,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -1966,6 +2183,13 @@ print_plugin_automatic_install_info_code
return;
}
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
-@@ -1805,15 +2029,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -2002,15 +2226,20 @@ print_plugin_automatic_install_info_code
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
{
const gchar *const *protocols;
-@@ -1822,13 +2051,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -2019,13 +2248,19 @@ print_plugin_automatic_install_info_prot
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
while (*protocols != NULL) {
++protocols;
}
break;
-@@ -1839,7 +2074,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -2036,7 +2271,7 @@ print_plugin_automatic_install_info_prot
}
static void
{
GList *features, *l;
-@@ -1858,11 +2093,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
+@@ -2055,11 +2290,15 @@ print_plugin_automatic_install_info (Gst
if (feature_plugin == plugin) {
GstElementFactory *factory;
}
if (feature_plugin)
gst_object_unref (feature_plugin);
-@@ -1884,7 +2123,7 @@ print_all_plugin_automatic_install_info (void)
+@@ -2083,7 +2322,7 @@ print_all_plugin_automatic_install_info
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
}
gst_plugin_list_free (orig_plugins);
}
-@@ -1951,6 +2190,7 @@ main (int argc, char *argv[])
+@@ -2169,6 +2408,7 @@ real_main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE;
gboolean color_always = FALSE;
-@@ -1972,6 +2212,9 @@ main (int argc, char *argv[])
+@@ -2190,6 +2430,9 @@ real_main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"types", 't', 0, G_OPTION_ARG_STRING, &types,
-@@ -2135,7 +2378,7 @@ main (int argc, char *argv[])
+@@ -2364,7 +2607,7 @@ real_main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
+ print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else {
print_plugin_info (plugin);
- print_plugin_features (plugin);
-@@ -2148,13 +2391,17 @@ main (int argc, char *argv[])
+ print_plugin_status (plugin);
+@@ -2378,13 +2621,16 @@ real_main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
+ print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else {
print_plugin_info (plugin);
+ print_plugin_status (plugin);
print_plugin_features (plugin);
}
} else {
-- g_printerr (_("Could not load plugin file: %s\n"), error->message);
+ if (!print_aii_rpm)
+ g_print (_("Could not load plugin file: %s\n"), error->message);
+ else
-+ g_printerr (_("Could not load plugin file: %s\n"),
-+ error->message);
+ g_printerr (_("Could not load plugin file: %s\n"), error->message);
g_clear_error (&error);
exit_code = -1;
- goto done;
---
-2.26.2
-