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

Simplify, remove -n and always print names if -a is specified

Browse source 
Original commit message from CVS:
(main): Simplify, remove -n and always print names if -a is specified
This commit is contained in:
Johan Dahlin 2004-06-14 11:28:16 +00:00
parent 45e3b8be25
commit ae5f02d5c4
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -3,6 +3,7 @@
* tools/gst-inspect.c (main): Add two new command line options: -a * tools/gst-inspect.c (main): Add two new command line options: -a
to print all elements and -n to print the name on each line. Also to print all elements and -n to print the name on each line. Also
fix some error reporting. fix some error reporting.
(main): Simplify, remove -n and always print names if -a is specified
2004-06-13 Steve Lhomme <steve.lhomme@free.fr> 2004-06-13 Steve Lhomme <steve.lhomme@free.fr>

14
tools/gst-inspect.c
View file

@ -862,7 +862,7 @@ print_children_info (GstElement * element)
} }
static void static void
print_element_list (gboolean print_all, gboolean print_names) print_element_list (gboolean print_all)
{ {
GList *plugins; GList *plugins;
@ -885,7 +885,7 @@ print_element_list (gboolean print_all, gboolean print_names)
factory = GST_ELEMENT_FACTORY (feature); factory = GST_ELEMENT_FACTORY (feature);
if (print_all) if (print_all)
print_element_info (factory, print_names); print_element_info (factory, TRUE);
else else
g_print ("%s: %s: %s\n", plugin->desc.name, g_print ("%s: %s: %s\n", plugin->desc.name,
GST_PLUGIN_FEATURE_NAME (factory), factory->details.longname); GST_PLUGIN_FEATURE_NAME (factory), factory->details.longname);
@ -1112,11 +1112,8 @@ main (int argc, char *argv[])
GstElementFactory *factory; GstElementFactory *factory;
GstPlugin *plugin; GstPlugin *plugin;
gchar *so; gchar *so;
gboolean print_names = FALSE;
gboolean print_all = FALSE; gboolean print_all = FALSE;
struct poptOption options[] = { struct poptOption options[] = {
{"print-names", 'n', POPT_ARG_NONE | POPT_ARGFLAG_STRIP, &print_names, 0,
N_("Print element names in the beginning of each line"), NULL},
{"print-all", 'a', POPT_ARG_NONE | POPT_ARGFLAG_STRIP, &print_all, 0, {"print-all", 'a', POPT_ARG_NONE | POPT_ARGFLAG_STRIP, &print_all, 0,
N_("Print all elements"), NULL}, N_("Print all elements"), NULL},
POPT_TABLEEND POPT_TABLEEND
@ -1134,14 +1131,11 @@ main (int argc, char *argv[])
if (print_all && argc > 2) { if (print_all && argc > 2) {
g_print ("-a requires no extra arguments\n"); g_print ("-a requires no extra arguments\n");
return 1; return 1;
} else if (print_names && argc < 3) {
g_print ("-n requires an element name\n");
return 1;
} }
/* if no arguments, print out list of elements */ /* if no arguments, print out list of elements */
if (argc == 1 || print_all) { if (argc == 1 || print_all) {
print_element_list (print_all, print_names); print_element_list (print_all);
/* else we try to get a factory */ /* else we try to get a factory */
} else { } else {
const char *arg = argv[argc - 1]; const char *arg = argv[argc - 1];
@ -1153,7 +1147,7 @@ main (int argc, char *argv[])
factory = gst_element_factory_find (arg); factory = gst_element_factory_find (arg);
/* if there's a factory, print out the info */ /* if there's a factory, print out the info */
if (factory) { if (factory) {
retval = print_element_info (factory, print_names); retval = print_element_info (factory, print_all);
} else { } else {
retval = print_element_features (arg); retval = print_element_features (arg);
} }