From 7b24d76260c30b0efe1409c1ecca06de739d741a Mon Sep 17 00:00:00 2001
From: Stefan Sauer <ensonic@users.sf.net>
Date: Fri, 12 Sep 2014 18:43:52 +0200
Subject: [PATCH] tracer: drop the HookId hid from the invoke method

The MessageId is more detailed and anyway needed to interpret the varargs.
---
 gst/gsttracer.c              |  5 ++---
 gst/gsttracer.h              |  6 +++---
 gst/gsttracerutils.c         |  2 +-
 plugins/tracers/gstlatency.c |  8 ++++----
 plugins/tracers/gstlog.c     | 15 +++++++--------
 plugins/tracers/gstrusage.c  |  8 ++++----
 plugins/tracers/gststats.c   |  8 ++++----
 7 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/gst/gsttracer.c b/gst/gsttracer.c
index 29696a8ef5..fd95ba28cb 100644
--- a/gst/gsttracer.c
+++ b/gst/gsttracer.c
@@ -131,14 +131,13 @@ gst_tracer_get_property (GObject * object, guint prop_id,
 }
 
 void
-gst_tracer_invoke (GstTracer * self, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
+gst_tracer_invoke (GstTracer * self, GstTracerMessageId mid, va_list var_args)
 {
   GstTracerClass *klass = GST_TRACER_GET_CLASS (self);
 
   g_return_if_fail (klass->invoke);
 
-  klass->invoke (self, hid, mid, var_args);
+  klass->invoke (self, mid, var_args);
 }
 
 /* tracing modules */
diff --git a/gst/gsttracer.h b/gst/gsttracer.h
index 02e2ec0a1a..6c96a0fbe4 100644
--- a/gst/gsttracer.h
+++ b/gst/gsttracer.h
@@ -53,7 +53,7 @@ struct _GstTracer {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-typedef void (*GstTracerInvokeFunction) (GstTracer * self, GstTracerHookId hid,
+typedef void (*GstTracerInvokeFunction) (GstTracer * self, 
     GstTracerMessageId mid, va_list var_args);
 
 struct _GstTracerClass {
@@ -66,8 +66,8 @@ struct _GstTracerClass {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-void gst_tracer_invoke (GstTracer * self, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args);
+void gst_tracer_invoke (GstTracer * self, GstTracerMessageId mid, 
+    va_list var_args);
 
 GType gst_tracer_get_type          (void);
 
diff --git a/gst/gsttracerutils.c b/gst/gsttracerutils.c
index ed83f82902..33678c2d1b 100644
--- a/gst/gsttracerutils.c
+++ b/gst/gsttracerutils.c
@@ -143,7 +143,7 @@ gst_tracer_dispatch (GstTracerHookId hid, GstTracerMessageId mid, ...)
 
   for (node = _priv_tracers[hid]; node; node = g_list_next (node)) {
     va_start (var_args, mid);
-    gst_tracer_invoke (node->data, hid, mid, var_args);
+    gst_tracer_invoke (node->data, mid, var_args);
     va_end (var_args);
   }
 }
diff --git a/plugins/tracers/gstlatency.c b/plugins/tracers/gstlatency.c
index 4467a19322..aa1dfa600d 100644
--- a/plugins/tracers/gstlatency.c
+++ b/plugins/tracers/gstlatency.c
@@ -89,8 +89,8 @@ get_real_pad_parent (GstPad * pad)
 
 /* tracer class */
 
-static void gst_latency_tracer_invoke (GstTracer * obj, GstTracerHookId id,
-    GstTracerMessageId mid, va_list var_args);
+static void gst_latency_tracer_invoke (GstTracer * obj, GstTracerMessageId mid,
+    va_list var_args);
 
 static void
 gst_latency_tracer_class_init (GstLatencyTracerClass * klass)
@@ -251,8 +251,8 @@ do_push_event_pre (GstLatencyTracer * self, va_list var_args)
 }
 
 static void
-gst_latency_tracer_invoke (GstTracer * obj, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
+gst_latency_tracer_invoke (GstTracer * obj, GstTracerMessageId mid,
+    va_list var_args)
 {
   GstLatencyTracer *self = GST_LATENCY_TRACER_CAST (obj);
 
diff --git a/plugins/tracers/gstlog.c b/plugins/tracers/gstlog.c
index 982a9e95c2..200e76670a 100644
--- a/plugins/tracers/gstlog.c
+++ b/plugins/tracers/gstlog.c
@@ -52,8 +52,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_QUERY);
 G_DEFINE_TYPE_WITH_CODE (GstLogTracer, gst_log_tracer, GST_TYPE_TRACER,
     _do_init);
 
-static void gst_log_tracer_invoke (GstTracer * self, GstTracerHookId id,
-    GstTracerMessageId mid, va_list var_args);
+static void gst_log_tracer_invoke (GstTracer * self, GstTracerMessageId mid,
+    va_list var_args);
 
 static void
 gst_log_tracer_class_init (GstLogTracerClass * klass)
@@ -70,8 +70,8 @@ gst_log_tracer_init (GstLogTracer * self)
 }
 
 static void
-gst_log_tracer_invoke (GstTracer * self, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
+gst_log_tracer_invoke (GstTracer * self, GstTracerMessageId mid,
+    va_list var_args)
 {
   const gchar *fmt = NULL;
   GstDebugCategory *cat = GST_CAT_DEFAULT;
@@ -137,11 +137,10 @@ gst_log_tracer_invoke (GstTracer * self, GstTracerHookId hid,
     gchar *str;
 
     __gst_vasprintf (&str, fmt, var_args);
-    GST_CAT_TRACE (cat, "[%d,%d] %" GST_TIME_FORMAT ", %s",
-        hid, mid, GST_TIME_ARGS (ts), str);
+    GST_CAT_TRACE (cat, "[%d] %" GST_TIME_FORMAT ", %s",
+        mid, GST_TIME_ARGS (ts), str);
     g_free (str);
   } else {
-    GST_CAT_TRACE (cat, "[%d,%d] %" GST_TIME_FORMAT,
-        hid, mid, GST_TIME_ARGS (ts));
+    GST_CAT_TRACE (cat, "[%d] %" GST_TIME_FORMAT, mid, GST_TIME_ARGS (ts));
   }
 }
diff --git a/plugins/tracers/gstrusage.c b/plugins/tracers/gstrusage.c
index dec2d3179a..721af78e72 100644
--- a/plugins/tracers/gstrusage.c
+++ b/plugins/tracers/gstrusage.c
@@ -78,8 +78,8 @@ typedef struct
 
 static GstTraceValues *tvs_proc;
 
-static void gst_rusage_tracer_invoke (GstTracer * self, GstTracerHookId id,
-    GstTracerMessageId mid, va_list var_args);
+static void gst_rusage_tracer_invoke (GstTracer * self, GstTracerMessageId mid,
+    va_list var_args);
 
 /* data helper */
 
@@ -249,8 +249,8 @@ gst_rusage_tracer_init (GstRUsageTracer * self)
 }
 
 static void
-gst_rusage_tracer_invoke (GstTracer * obj, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
+gst_rusage_tracer_invoke (GstTracer * obj, GstTracerMessageId mid,
+    va_list var_args)
 {
   GstRUsageTracer *self = GST_RUSAGE_TRACER_CAST (obj);
   guint64 ts = va_arg (var_args, guint64);
diff --git a/plugins/tracers/gststats.c b/plugins/tracers/gststats.c
index 0938f27c5d..972a352d87 100644
--- a/plugins/tracers/gststats.c
+++ b/plugins/tracers/gststats.c
@@ -339,8 +339,8 @@ do_element_stats (GstStatsTracer * self, GstPad * pad, GstClockTime elapsed1,
 /* tracer class */
 
 static void gst_stats_tracer_finalize (GObject * obj);
-static void gst_stats_tracer_invoke (GstTracer * obj, GstTracerHookId id,
-    GstTracerMessageId mid, va_list var_args);
+static void gst_stats_tracer_invoke (GstTracer * obj, GstTracerMessageId mid,
+    va_list var_args);
 
 static void
 gst_stats_tracer_class_init (GstStatsTracerClass * klass)
@@ -611,8 +611,8 @@ do_query_post (GstStatsTracer * self, va_list var_args)
 }
 
 static void
-gst_stats_tracer_invoke (GstTracer * obj, GstTracerHookId hid,
-    GstTracerMessageId mid, va_list var_args)
+gst_stats_tracer_invoke (GstTracer * obj, GstTracerMessageId mid,
+    va_list var_args)
 {
   GstStatsTracer *self = GST_STATS_TRACER_CAST (obj);