mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-launch: Use gst_print* instead of g_print* to fix broken stdout on Windows

Browse source 
Concurrent Windows' colored debug message and g_print will print
string hard to read. Instead, use gst_print* which serialize
debug output and the APIs call.
This commit is contained in:
Seungha Yang 2019-08-20 01:02:48 +09:00 committed by Tim-Philipp Müller
parent e6c43380bb
commit 493a3261a9
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/gst-launch.c
View file

@ -68,7 +68,7 @@ static gboolean waiting_eos = FALSE;
static gchar **exclude_args = NULL; static gchar **exclude_args = NULL;
/* convenience macro so we don't have to litter the code with if(!quiet) */ /* convenience macro so we don't have to litter the code with if(!quiet) */
#define PRINT if(!quiet)g_print #define PRINT if(!quiet)gst_print
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
static void static void
@ -322,9 +322,9 @@ print_error_message (GstMessage * msg)
name = gst_object_get_path_string (msg->src); name = gst_object_get_path_string (msg->src);
gst_message_parse_error (msg, &err, &debug); gst_message_parse_error (msg, &err, &debug);
g_printerr (_("ERROR: from element %s: %s\n"), name, err->message); gst_printerr (_("ERROR: from element %s: %s\n"), name, err->message);
if (debug != NULL) if (debug != NULL)
g_printerr (_("Additional debug info:\n%s\n"), debug); gst_printerr (_("Additional debug info:\n%s\n"), debug);
g_clear_error (&err); g_clear_error (&err);
g_free (debug); g_free (debug);
@ -1044,9 +1044,9 @@ main (int argc, char *argv[])
g_option_context_add_group (ctx, gst_init_get_option_group ()); g_option_context_add_group (ctx, gst_init_get_option_group ());
if (!g_option_context_parse (ctx, &argc, &argv, &err)) { if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
if (err) if (err)
g_printerr ("Error initializing: %s\n", GST_STR_NULL (err->message)); gst_printerr ("Error initializing: %s\n", GST_STR_NULL (err->message));
else else
g_printerr ("Error initializing: Unknown error!\n"); gst_printerr ("Error initializing: Unknown error!\n");
g_clear_error (&err); g_clear_error (&err);
g_option_context_free (ctx); g_option_context_free (ctx);
exit (1); exit (1);
@ -1074,15 +1074,15 @@ main (int argc, char *argv[])
if (!pipeline) { if (!pipeline) {
if (error) { if (error) {
g_printerr (_("ERROR: pipeline could not be constructed: %s.\n"), gst_printerr (_("ERROR: pipeline could not be constructed: %s.\n"),
GST_STR_NULL (error->message)); GST_STR_NULL (error->message));
g_clear_error (&error); g_clear_error (&error);
} else { } else {
g_printerr (_("ERROR: pipeline could not be constructed.\n")); gst_printerr (_("ERROR: pipeline could not be constructed.\n"));
} }
return 1; return 1;
} else if (error) { } else if (error) {
g_printerr (_("WARNING: erroneous pipeline: %s\n"), gst_printerr (_("WARNING: erroneous pipeline: %s\n"),
GST_STR_NULL (error->message)); GST_STR_NULL (error->message));
g_clear_error (&error); g_clear_error (&error);
return 1; return 1;
@ -1098,7 +1098,7 @@ main (int argc, char *argv[])
GstElement *real_pipeline = gst_element_factory_make ("pipeline", NULL); GstElement *real_pipeline = gst_element_factory_make ("pipeline", NULL);
if (real_pipeline == NULL) { if (real_pipeline == NULL) {
g_printerr (_("ERROR: the 'pipeline' element wasn't found.\n")); gst_printerr (_("ERROR: the 'pipeline' element wasn't found.\n"));
return 1; return 1;
} }
gst_bin_add (GST_BIN (real_pipeline), pipeline); gst_bin_add (GST_BIN (real_pipeline), pipeline);
@ -1134,7 +1134,7 @@ main (int argc, char *argv[])
switch (ret) { switch (ret) {
case GST_STATE_CHANGE_FAILURE: case GST_STATE_CHANGE_FAILURE:
g_printerr (_("ERROR: Pipeline doesn't want to pause.\n")); gst_printerr (_("ERROR: Pipeline doesn't want to pause.\n"));
res = -1; res = -1;
event_loop (pipeline, FALSE, FALSE, GST_STATE_VOID_PENDING); event_loop (pipeline, FALSE, FALSE, GST_STATE_VOID_PENDING);
goto end; goto end;
@ -1146,7 +1146,7 @@ main (int argc, char *argv[])
PRINT (_("Pipeline is PREROLLING ...\n")); PRINT (_("Pipeline is PREROLLING ...\n"));
caught_error = event_loop (pipeline, TRUE, TRUE, GST_STATE_PAUSED); caught_error = event_loop (pipeline, TRUE, TRUE, GST_STATE_PAUSED);
if (caught_error) { if (caught_error) {
g_printerr (_("ERROR: pipeline doesn't want to preroll.\n")); gst_printerr (_("ERROR: pipeline doesn't want to preroll.\n"));
res = caught_error; res = caught_error;
goto end; goto end;
} }
@ -1160,7 +1160,7 @@ main (int argc, char *argv[])
caught_error = event_loop (pipeline, FALSE, TRUE, GST_STATE_PLAYING); caught_error = event_loop (pipeline, FALSE, TRUE, GST_STATE_PLAYING);
if (caught_error) { if (caught_error) {
g_printerr (_("ERROR: pipeline doesn't want to preroll.\n")); gst_printerr (_("ERROR: pipeline doesn't want to preroll.\n"));
res = caught_error; res = caught_error;
} else { } else {
GstClockTime tfthen, tfnow; GstClockTime tfthen, tfnow;
@ -1173,7 +1173,7 @@ main (int argc, char *argv[])
GstMessage *err_msg; GstMessage *err_msg;
GstBus *bus; GstBus *bus;
g_printerr (_("ERROR: pipeline doesn't want to play.\n")); gst_printerr (_("ERROR: pipeline doesn't want to play.\n"));
bus = gst_element_get_bus (pipeline); bus = gst_element_get_bus (pipeline);
if ((err_msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0))) { if ((err_msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0))) {
print_error_message (err_msg); print_error_message (err_msg);