From 8c2deca31beecec55e20da818866941f07c0cac9 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 29 Sep 2005 18:25:50 +0000 Subject: [PATCH] use message type names Original commit message from CVS: use message type names --- common | 2 +- gst/gstbin.c | 4 ++-- gst/gstbus.c | 9 ++++++++- gst/gstmessage.c | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/common b/common index 7caeee4..5cd4217 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7caeee4b949b4388927fec7fcf25f767429bde30 +Subproject commit 5cd4217979c25fc1fcbb82282e4ad6cbdea9e6cf diff --git a/gst/gstbin.c b/gst/gstbin.c index 20e5ac2..d5b05b0 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -1523,8 +1523,8 @@ gst_bin_send_event (GstElement * element, GstEvent * event) static GstBusSyncReply bin_bus_handler (GstBus * bus, GstMessage * message, GstBin * bin) { - GST_DEBUG_OBJECT (bin, "[msg %p] handling child message of type %d", - message, GST_MESSAGE_TYPE (message)); + GST_DEBUG_OBJECT (bin, "[msg %p] handling child message of type %s", + message, gst_message_type_get_name (GST_MESSAGE_TYPE (message))); switch (GST_MESSAGE_TYPE (message)) { case GST_MESSAGE_EOS:{ diff --git a/gst/gstbus.c b/gst/gstbus.c index 4abd3e6..6e1618c 100644 --- a/gst/gstbus.c +++ b/gst/gstbus.c @@ -455,11 +455,18 @@ gst_bus_pop (GstBus * bus) g_return_val_if_fail (GST_IS_BUS (bus), NULL); + GST_DEBUG_OBJECT (bus, "%d messages on the bus", + g_queue_get_length (bus->queue)); + g_mutex_lock (bus->queue_lock); message = g_queue_pop_head (bus->queue); g_mutex_unlock (bus->queue_lock); - GST_DEBUG_OBJECT (bus, "pop on bus, got message %p", message); + if (message) + GST_DEBUG_OBJECT (bus, "pop on bus, got message %p, %s", message, + gst_message_type_get_name (GST_MESSAGE_TYPE (message))); + else + GST_DEBUG_OBJECT (bus, "pop on bus, no message"); return message; } diff --git a/gst/gstmessage.c b/gst/gstmessage.c index 4926932..ae4b97d 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -226,7 +226,8 @@ gst_message_new (GstMessageType type, GstObject * src) message = (GstMessage *) gst_mini_object_new (GST_TYPE_MESSAGE); - GST_CAT_INFO (GST_CAT_MESSAGE, "creating new message %p %d", message, type); + GST_CAT_INFO (GST_CAT_MESSAGE, "creating new message %p %s", message, + gst_message_type_get_name (type)); message->type = type; if (src) { -- 2.7.4