mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

tools/gst-inspect.c (main): Fallback to plugin if no element is found. This matches the old behavior better. Thanks t...

Browse source 
Original commit message from CVS:
* tools/gst-inspect.c (main): Fallback to plugin if no element is
found. This matches the old behavior better. Thanks to Thomas for
pointing out.
This commit is contained in:
Johan Dahlin 2004-06-15 14:17:55 +00:00
parent 4a26e6f2c7
commit d6ae3e5426
2 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-06-15 Johan Dahlin <johan@gnome.org>
* tools/gst-inspect.c (main): Fallback to plugin if no element is
found. This matches the old behavior better. Thanks to Thomas for
pointing out.
2004-06-14 David Schleef <ds@schleef.org> 2004-06-14 David Schleef <ds@schleef.org>
* gst/gstcpu.c: (gst_cpuid_i386): Fix problem when using * gst/gstcpu.c: (gst_cpuid_i386): Fix problem when using

26
tools/gst-inspect.c
View file

@ -1109,9 +1109,6 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
GstElementFactory *factory;
GstPlugin *plugin;
gchar *so;
gboolean print_all = FALSE; gboolean print_all = FALSE;
struct poptOption options[] = { struct poptOption options[] = {
{"print-all", 'a', POPT_ARG_NONE | POPT_ARGFLAG_STRIP, &print_all, 0, {"print-all", 'a', POPT_ARG_NONE | POPT_ARGFLAG_STRIP, &print_all, 0,
@ -1138,10 +1135,9 @@ main (int argc, char *argv[])
print_element_list (print_all); print_element_list (print_all);
/* else we try to get a factory */ /* else we try to get a factory */
} else { } else {
GstElementFactory *factory;
GstPlugin *plugin;
const char *arg = argv[argc - 1]; const char *arg = argv[argc - 1];
/* only search for a factory if there's not a '.so' */
if (!strstr (argv[1], ".so")) {
int retval; int retval;
factory = gst_element_factory_find (arg); factory = gst_element_factory_find (arg);
@ -1152,29 +1148,19 @@ main (int argc, char *argv[])
retval = print_element_features (arg); retval = print_element_features (arg);
} }
if (retval) /* otherwise check if it's a plugin */
g_print ("No such element: '%s'\n", arg); if (retval) {
return retval;
} else {
/* strip the .so */
so = strstr (argv[argc - 1], ".so");
so[0] = '\0';
}
/* otherwise assume it's a plugin */
plugin = gst_registry_pool_find_plugin (arg); plugin = gst_registry_pool_find_plugin (arg);
/* if there is such a plugin, print out info */ /* if there is such a plugin, print out info */
if (plugin) { if (plugin) {
print_plugin_info (plugin); print_plugin_info (plugin);
} else { } else {
g_print ("No such plugin '%s'\n", arg); g_print ("No such element or plugin '%s'\n", arg);
return -1; return -1;
} }
} }
}
return 0; return 0;
} }