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

gst-inspect: Don't setup pager too early

Browse source 
Setup it only if we have something to print out about inspected results.
Otherwise, gst_tools_print_version() output will be redirected to pager and also
exit immediately without waiting child process.
This commit is contained in:
Seungha Yang 2019-01-17 11:22:27 +09:00
parent 56b4fbef5e
commit 4b55be4728
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tools/gst-inspect.c
View file

@ -2006,27 +2006,6 @@ main (int argc, char *argv[])
gst_init (&argc, &argv); gst_init (&argc, &argv);
#endif #endif
no_colors = g_getenv ("GST_INSPECT_NO_COLORS");
/* We only support truecolor */
colored_output &= (no_colors == NULL);
#ifdef G_OS_UNIX
if (isatty (STDOUT_FILENO)) {
if (redirect_stdout ())
loop = g_main_loop_new (NULL, FALSE);
} else {
colored_output = FALSE;
}
#elif defined(G_OS_WIN32)
{
gint fd = _fileno (stdout);
/* On Windows 10, g_log_writer_supports_color will also setup the console
* so that it correctly interprets ANSI VT sequences if it's supported */
if (!_isatty (fd) || !g_log_writer_supports_color (fd))
colored_output = FALSE;
}
#endif
gst_tools_print_version (); gst_tools_print_version ();
if (print_all && argc > 1) { if (print_all && argc > 1) {
@ -2077,6 +2056,27 @@ main (int argc, char *argv[])
return exit_code; return exit_code;
} }
no_colors = g_getenv ("GST_INSPECT_NO_COLORS");
/* We only support truecolor */
colored_output &= (no_colors == NULL);
#ifdef G_OS_UNIX
if (isatty (STDOUT_FILENO)) {
if (redirect_stdout ())
loop = g_main_loop_new (NULL, FALSE);
} else {
colored_output = FALSE;
}
#elif defined(G_OS_WIN32)
{
gint fd = _fileno (stdout);
/* On Windows 10, g_log_writer_supports_color will also setup the console
* so that it correctly interprets ANSI VT sequences if it's supported */
if (!_isatty (fd) || !g_log_writer_supports_color (fd))
colored_output = FALSE;
}
#endif
/* if no arguments, print out list of elements */ /* if no arguments, print out list of elements */
if (uri_handlers) { if (uri_handlers) {
print_all_uri_handlers (); print_all_uri_handlers ();