From 19e0ea04589bb2416cea0d9fe383e8845ecc5ac6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 6 Feb 2002 21:57:35 +0000 Subject: [PATCH] Converted a few _info events to properties.. Original commit message from CVS: Converted a few _info events to properties.. --- gst/elements/gstfakesink.c | 23 +++++++++++++++-------- gst/elements/gstfakesrc.c | 29 +++++++++++++++++++++++------ plugins/elements/gstfakesink.c | 23 +++++++++++++++-------- plugins/elements/gstfakesrc.c | 29 +++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 28 deletions(-) diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index 8c07e25..5508099 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -46,6 +46,7 @@ enum { ARG_NUM_SINKS, ARG_SILENT, ARG_DUMP, + ARG_LAST_MESSAGE, }; GST_PADTEMPLATE_FACTORY (fakesink_sink_factory, @@ -107,6 +108,10 @@ gst_fakesink_class_init (GstFakeSinkClass *klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS, g_param_spec_int ("num_sinks", "num_sinks", "num_sinks", 1, G_MAXINT, 1, G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, + g_param_spec_string ("last_message", "last_message", "last_message", + NULL, G_PARAM_READABLE)); + gst_element_install_std_props ( GST_ELEMENT_CLASS (klass), @@ -136,6 +141,7 @@ gst_fakesink_init (GstFakeSink *fakesink) fakesink->silent = FALSE; fakesink->dump = FALSE; + fakesink->last_message = NULL; } static GstPad* @@ -202,6 +208,9 @@ gst_fakesink_get_property (GObject *object, guint prop_id, GValue *value, GParam case ARG_DUMP: g_value_set_boolean (value, sink->dump); break; + case ARG_LAST_MESSAGE: + g_value_set_string (value, sink->last_message); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -219,16 +228,14 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf) fakesink = GST_FAKESINK (gst_pad_get_parent (pad)); - /* - if (GST_IS_EVENT (buf)) { - gst_pad_event_default (pad, GST_EVENT (buf)); - return; - } - */ - if (!fakesink->silent) { - gst_element_info (GST_ELEMENT (fakesink), "chain ******* (%s:%s)< (%d bytes, %lld) %p", + if (fakesink->last_message) + g_free (fakesink->last_message); + + fakesink->last_message = g_strdup_printf ("chain ******* (%s:%s)< (%d bytes, %lld) %p", GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf); + + g_object_notify (G_OBJECT (fakesink), "last_message"); } g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad); diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c index 2946b61..61613cd 100644 --- a/gst/elements/gstfakesrc.c +++ b/gst/elements/gstfakesrc.c @@ -60,7 +60,8 @@ enum { ARG_EOS, ARG_SILENT, ARG_DUMP, - ARG_PARENTSIZE + ARG_PARENTSIZE, + ARG_LAST_MESSAGE, }; GST_PADTEMPLATE_FACTORY (fakesrc_src_factory, @@ -231,6 +232,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS, g_param_spec_boolean("eos","eos","eos", TRUE,G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, + g_param_spec_string ("last_message", "last_message", "last_message", + NULL, G_PARAM_READABLE)); gst_element_install_std_props ( GST_ELEMENT_CLASS (klass), @@ -277,6 +281,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc) fakesrc->sizemax = 4096; fakesrc->parent = NULL; fakesrc->parentsize = 4096 * 10; + fakesrc->last_message = NULL; } static GstPad* @@ -424,7 +429,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G break; case ARG_EOS: src->eos = g_value_get_boolean (value); -GST_INFO (0, "will EOS on next buffer"); + GST_INFO (0, "will EOS on next buffer"); break; case ARG_SILENT: src->silent = g_value_get_boolean (value); @@ -490,6 +495,9 @@ gst_fakesrc_get_property (GObject *object, guint prop_id, GValue *value, GParamS case ARG_DUMP: g_value_set_boolean (value, src->dump); break; + case ARG_LAST_MESSAGE: + g_value_set_string (value, src->last_message); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -666,9 +674,13 @@ gst_fakesrc_get(GstPad *pad) GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; if (!src->silent) { - gst_element_info (GST_ELEMENT (src), - "get ******* (%s:%s)> (%d bytes, %llu)", + if (src->last_message) + g_free (src->last_message); + + src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu)", GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + + g_object_notify (G_OBJECT (src), "last_message"); } GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n"); @@ -719,8 +731,13 @@ gst_fakesrc_loop(GstElement *element) GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; if (!src->silent) { - gst_element_info (element, "fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)", - GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + if (src->last_message) + g_free (src->last_message); + + src->last_message = g_strdup_printf ("fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)", + GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + + g_object_notify (G_OBJECT (src), "last_message"); } g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0, diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 8c07e25..5508099 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -46,6 +46,7 @@ enum { ARG_NUM_SINKS, ARG_SILENT, ARG_DUMP, + ARG_LAST_MESSAGE, }; GST_PADTEMPLATE_FACTORY (fakesink_sink_factory, @@ -107,6 +108,10 @@ gst_fakesink_class_init (GstFakeSinkClass *klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS, g_param_spec_int ("num_sinks", "num_sinks", "num_sinks", 1, G_MAXINT, 1, G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, + g_param_spec_string ("last_message", "last_message", "last_message", + NULL, G_PARAM_READABLE)); + gst_element_install_std_props ( GST_ELEMENT_CLASS (klass), @@ -136,6 +141,7 @@ gst_fakesink_init (GstFakeSink *fakesink) fakesink->silent = FALSE; fakesink->dump = FALSE; + fakesink->last_message = NULL; } static GstPad* @@ -202,6 +208,9 @@ gst_fakesink_get_property (GObject *object, guint prop_id, GValue *value, GParam case ARG_DUMP: g_value_set_boolean (value, sink->dump); break; + case ARG_LAST_MESSAGE: + g_value_set_string (value, sink->last_message); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -219,16 +228,14 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf) fakesink = GST_FAKESINK (gst_pad_get_parent (pad)); - /* - if (GST_IS_EVENT (buf)) { - gst_pad_event_default (pad, GST_EVENT (buf)); - return; - } - */ - if (!fakesink->silent) { - gst_element_info (GST_ELEMENT (fakesink), "chain ******* (%s:%s)< (%d bytes, %lld) %p", + if (fakesink->last_message) + g_free (fakesink->last_message); + + fakesink->last_message = g_strdup_printf ("chain ******* (%s:%s)< (%d bytes, %lld) %p", GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf); + + g_object_notify (G_OBJECT (fakesink), "last_message"); } g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad); diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index 2946b61..61613cd 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -60,7 +60,8 @@ enum { ARG_EOS, ARG_SILENT, ARG_DUMP, - ARG_PARENTSIZE + ARG_PARENTSIZE, + ARG_LAST_MESSAGE, }; GST_PADTEMPLATE_FACTORY (fakesrc_src_factory, @@ -231,6 +232,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS, g_param_spec_boolean("eos","eos","eos", TRUE,G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE, + g_param_spec_string ("last_message", "last_message", "last_message", + NULL, G_PARAM_READABLE)); gst_element_install_std_props ( GST_ELEMENT_CLASS (klass), @@ -277,6 +281,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc) fakesrc->sizemax = 4096; fakesrc->parent = NULL; fakesrc->parentsize = 4096 * 10; + fakesrc->last_message = NULL; } static GstPad* @@ -424,7 +429,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G break; case ARG_EOS: src->eos = g_value_get_boolean (value); -GST_INFO (0, "will EOS on next buffer"); + GST_INFO (0, "will EOS on next buffer"); break; case ARG_SILENT: src->silent = g_value_get_boolean (value); @@ -490,6 +495,9 @@ gst_fakesrc_get_property (GObject *object, guint prop_id, GValue *value, GParamS case ARG_DUMP: g_value_set_boolean (value, src->dump); break; + case ARG_LAST_MESSAGE: + g_value_set_string (value, src->last_message); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -666,9 +674,13 @@ gst_fakesrc_get(GstPad *pad) GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; if (!src->silent) { - gst_element_info (GST_ELEMENT (src), - "get ******* (%s:%s)> (%d bytes, %llu)", + if (src->last_message) + g_free (src->last_message); + + src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu)", GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + + g_object_notify (G_OBJECT (src), "last_message"); } GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n"); @@ -719,8 +731,13 @@ gst_fakesrc_loop(GstElement *element) GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; if (!src->silent) { - gst_element_info (element, "fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)", - GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + if (src->last_message) + g_free (src->last_message); + + src->last_message = g_strdup_printf ("fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)", + GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf)); + + g_object_notify (G_OBJECT (src), "last_message"); } g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0, -- 2.7.4