launcher: Enhance printed output

diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c
index 6254021..8241b05 100644 (file)
--- a/tools/ges-launcher.c
+++ b/tools/ges-launcher.c
@@ -195,7 +195,7 @@ static void
 _project_loading_error_cb (GESProject * project, GESTimeline * timeline,
     GError * error, GESLauncher * self)
 {
-  g_printerr ("Error loading timeline: '%s'\n", error->message);
+  printerr ("Error loading timeline: '%s'\n", error->message);
   self->priv->seenerrors = TRUE;
 
   g_application_quit (G_APPLICATION (self));
@@ -259,7 +259,7 @@ static void
 _error_loading_asset_cb (GESProject * project, GError * error,
     const gchar * failed_id, GType extractable_type, GESLauncher * self)
 {
-  g_printerr ("Error loading asset %s: %s\n", failed_id, error->message);
+  printerr ("Error loading asset %s: %s\n", failed_id, error->message);
   self->priv->seenerrors = TRUE;
 
   g_application_quit (G_APPLICATION (self));
@@ -292,7 +292,7 @@ _create_timeline (GESLauncher * self, const gchar * serialized_timeline,
       GES_TIMELINE (ges_asset_extract (GES_ASSET (project), &error));
 
   if (error) {
-    g_printerr ("\nERROR: Could not create timeline because: %s\n\n",
+    printerr ("\nERROR: Could not create timeline because: %s\n\n",
         error->message);
     g_error_free (error);
     return FALSE;
@@ -351,9 +351,9 @@ bus_message_cb (GstBus * bus, GstMessage * message, GESLauncher * self)
       gst_message_parse_error (message, &err, &dbg_info);
       GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (self->priv->pipeline),
           GST_DEBUG_GRAPH_SHOW_ALL, "ges-launch-error");
-      g_printerr ("ERROR from element %s: %s\n", GST_OBJECT_NAME (message->src),
+      printerr ("ERROR from element %s: %s\n", GST_OBJECT_NAME (message->src),
           err->message);
-      g_printerr ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none");
+      printerr ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none");
       g_clear_error (&err);
       g_free (dbg_info);
       self->priv->seenerrors = TRUE;
@@ -361,7 +361,7 @@ bus_message_cb (GstBus * bus, GstMessage * message, GESLauncher * self)
       break;
     }
     case GST_MESSAGE_EOS:
-      g_printerr ("\nDone\n");
+      ok ("\nDone\n");
       g_application_quit (G_APPLICATION (self));
       break;
     case GST_MESSAGE_STATE_CHANGED:
@@ -476,7 +476,7 @@ _run_pipeline (GESLauncher * self)
     }
 
     if (!_timeline_set_user_options (self, self->priv->timeline, NULL)) {
-      g_printerr ("Could not properly set tracks\n");
+      printerr ("Could not properly set tracks\n");
       return FALSE;
     }
   }
@@ -538,7 +538,7 @@ _set_rendering_details (GESLauncher * self)
 
       g_free (format);
       if (!prof) {
-        error ("Could not find any encoding format for %s\n", opts->format);
+        printerr ("Could not find any encoding format for %s\n", opts->format);
         return FALSE;
       }
 
@@ -820,7 +820,7 @@ _local_command_line (GApplication * application, gchar ** arguments[],
   gst_init (&argc, &argv);
   if (!g_option_context_parse (ctx, &argc, &argv, &error)) {
     gst_init (NULL, NULL);
-    g_printerr ("Error initializing: %s\n", error->message);
+    printerr ("Error initializing: %s\n", error->message);
     g_option_context_free (ctx);
     g_error_free (error);
     *exit_status = 1;
@@ -866,7 +866,7 @@ _startup (GApplication * application)
 
   /* Initialize the GStreamer Editing Services */
   if (!ges_init ()) {
-    g_printerr ("Error initializing GES\n");
+    printerr ("Error initializing GES\n");
     goto done;
   }
 

diff --git a/tools/utils.c b/tools/utils.c
index 074cc40..ce8c852 100644 (file)
--- a/tools/utils.c
+++ b/tools/utils.c
@@ -205,7 +205,7 @@ warn (const gchar * format, ...)
 }
 
 void
-error (const gchar * format, ...)
+printerr (const gchar * format, ...)
 {
   va_list var_args;
 

diff --git a/tools/utils.h b/tools/utils.h
index 018ade7..4df2641 100644 (file)
--- a/tools/utils.h
+++ b/tools/utils.h
@@ -29,7 +29,7 @@ void print_enum (GType enum_type);
 void print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args);
 void ok (const gchar * format, ...);
 void warn (const gchar * format, ...);
-void error (const gchar * format, ...);
+void printerr (const gchar * format, ...);
 
 gchar * get_file_extension (gchar * uri);
 void describe_encoding_profile (GstEncodingProfile *profile);
\ No newline at end of file