oops, too much revert

Original commit message from CVS:
oops, too much revert

diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 8f32b458a5bf1dd57207c106cd9e6a716f373cf2..fb93646314c0468f9e2c99d424bda6477a93bb96 100644 (file)
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -50,6 +50,8 @@ int dladdr(void *address, Dl_info *dl)
 
 extern gchar *_gst_progname;
 
+GStaticPrivate _gst_debug_cothread_index = G_STATIC_PRIVATE_INIT;
+
 
 /***** Categories and colorization *****/
 /* be careful with these, make them match the enum */
@@ -191,9 +193,9 @@ gst_default_debug_handler (gint category, gboolean incore,
                           void *element, gchar *string)
 {
   gchar *empty = "";
-  gchar *elementname = empty,* location = empty;
-  int pid = getpid ();
-  int cothread_id = 0; /*FIXME*/
+  gchar *elementname = empty,*location = empty;
+  int pid = getpid();
+  int cothread_id = (int) g_static_private_get(&_gst_debug_cothread_index);
 #ifdef GST_DEBUG_COLOR
   int pid_color = pid%6 + 31;
   int cothread_color = (cothread_id < 0) ? 37 : (cothread_id%6 + 31);
@@ -303,9 +305,9 @@ gst_default_info_handler (gint category, gboolean incore,
                          void *element, gchar *string)
 {
   gchar *empty = "";
-  gchar *elementname = empty, *location = empty;
-  int pid = getpid ();
-  int cothread_id = 0; /*FIXME*/
+  gchar *elementname = empty,*location = empty;
+  int pid = getpid();
+  int cothread_id = (int) g_static_private_get(&_gst_debug_cothread_index);
 #ifdef GST_DEBUG_COLOR
   int pid_color = pid%6 + 31;
   int cothread_color = (cothread_id < 0) ? 37 : (cothread_id%6 + 31);

diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 5b31da716a8645e9e18abea107fdb5b249b67a98..957d107a3b253d69409dc86d6bc5ded8654bcfe0 100644 (file)
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -112,6 +112,7 @@ enum {
 
 extern const gchar *_gst_category_colors[32];
 
+extern GStaticPrivate _gst_debug_cothread_index;
 
 
 /**********************************************************************