From 31c5f8a6ce4f29f344767ba3eebf910f68d1de00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 3 May 2008 19:08:50 +0000
Subject: [PATCH] gst/gstinfo.c: Fix alignment of debug log columns on 64-bit.

Original commit message from CVS:
* gst/gstinfo.c: (gst_debug_log_default):
Fix alignment of debug log columns on 64-bit.
---
 ChangeLog     |  5 +++++
 gst/gstinfo.c | 23 ++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc72eff6d8..035a57bfcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-03  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* gst/gstinfo.c: (gst_debug_log_default):
+	  Fix alignment of debug log columns on 64-bit.
+
 2008-05-03  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* docs/libs/Makefile.am:
diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 0195a46e97..db7333e12a 100644
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -665,20 +665,25 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level,
   elapsed = GST_CLOCK_DIFF (_priv_gst_info_start_time,
       gst_util_get_timestamp ());
 
-  /*
-     g_printerr ("%s (%p - %" GST_TIME_FORMAT ") %s%20s%s(%s%5d%s) %s%s(%d):%s:%s%s %s\n",
-     gst_debug_level_get_name (level), g_thread_self (),
-     GST_TIME_ARGS (elapsed), color,
-     gst_debug_category_get_name (category), clear, pidcolor, pid, clear,
-     color, file, line, function, obj, clear, gst_debug_message_get (message));
-   */
-
+#if defined (GLIB_SIZEOF_VOID_P) && GLIB_SIZEOF_VOID_P == 8
+  /* width of %p varies depending on actual value of pointer, which can make
+   * output unevenly aligned if multiple threads are involved, hence the %14p
+   * (should really be %18p, but %14p seems a good compromise between too many
+   * white spaces and likely unalignment on my system) */
   g_printerr ("%" GST_TIME_FORMAT
-      " %s%5d%s %p %s%s%s %s%20s %s:%d:%s:%s%s %s\n", GST_TIME_ARGS (elapsed),
+      " %s%5d%s %14p %s%s%s %s%20s %s:%d:%s:%s%s %s\n", GST_TIME_ARGS (elapsed),
       pidcolor, pid, clear, g_thread_self (), levelcolor,
       gst_debug_level_get_name (level), clear, color,
       gst_debug_category_get_name (category), file, line, function, obj, clear,
       gst_debug_message_get (message));
+#else
+  g_printerr ("%" GST_TIME_FORMAT
+      " %s%5d%s %10p %s%s%s %s%20s %s:%d:%s:%s%s %s\n", GST_TIME_ARGS (elapsed),
+      pidcolor, pid, clear, g_thread_self (), levelcolor,
+      gst_debug_level_get_name (level), clear, color,
+      gst_debug_category_get_name (category), file, line, function, obj, clear,
+      gst_debug_message_get (message));
+#endif
 
   if (free_color)
     g_free (color);