From 440b1e419a854133b31375ea70af372dad50d781 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 20 Sep 2005 15:45:42 +0000 Subject: [PATCH] remove the sync property from fakesink. Original commit message from CVS: * check/gst/gstevent.c: * gst/elements/gstfakesink.c: * gst/elements/gstfakesink.h: remove the sync property from fakesink. has the side effect of setting sync TRUE for fakesink, which is a change. Anyone who knows how to fix this nicely in a GObject-y way, feel free. --- ChangeLog | 16 +++++++++++++--- check/gst/gstevent.c | 2 ++ docs/gst/tmpl/gstelement.sgml | 3 --- docs/gst/tmpl/gstenumtypes.sgml | 3 --- docs/gst/tmpl/gstimplementsinterface.sgml | 3 --- docs/gst/tmpl/gstindex.sgml | 3 --- docs/gst/tmpl/gstindexfactory.sgml | 3 --- docs/gst/tmpl/gstinfo.sgml | 3 --- docs/gst/tmpl/gstobject.sgml | 3 --- docs/gst/tmpl/gstpad.sgml | 3 --- docs/gst/tmpl/gstpadtemplate.sgml | 3 --- docs/gst/tmpl/gstpipeline.sgml | 3 --- docs/gst/tmpl/gstplugin.sgml | 3 --- docs/gst/tmpl/gstpluginfeature.sgml | 3 --- docs/gst/tmpl/gsttypes.sgml | 3 --- docs/gst/tmpl/gstvalue.sgml | 3 --- docs/libs/tmpl/gstdataprotocol.sgml | 3 --- gst/elements/gstfakesink.c | 25 ------------------------- gst/elements/gstfakesink.h | 1 - plugins/elements/gstfakesink.c | 25 ------------------------- plugins/elements/gstfakesink.h | 1 - tests/check/gst/gstevent.c | 2 ++ 22 files changed, 17 insertions(+), 100 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e8540c..82a219d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,24 @@ +2005-09-20 Thomas Vander Stichele + + * check/gst/gstevent.c: + * gst/elements/gstfakesink.c: + * gst/elements/gstfakesink.h: + remove the sync property from fakesink. + has the side effect of setting sync TRUE + for fakesink, which is a change. Anyone who knows how + to fix this nicely in a GObject-y way, feel free. + 2005-09-20 Stefan Kost * docs/gst/gstreamer-docs.sgml: - remove probe refsection + remove probe refsection 2005-09-20 Stefan Kost * check/Makefile.am: - disable valgrinding the controller test again + disable valgrinding the controller test again * docs/gst/gstreamer-sections.txt: - update for api-changes + update for api-changes 2005-09-20 Wim Taymans diff --git a/check/gst/gstevent.c b/check/gst/gstevent.c index 616a393..326bcab 100644 --- a/check/gst/gstevent.c +++ b/check/gst/gstevent.c @@ -304,6 +304,8 @@ GST_START_TEST (send_custom_events) gst_bin_add_many (pipeline, fakesrc, queue, fakesink, NULL); fail_unless (gst_element_link_many (fakesrc, queue, fakesink, NULL)); + g_object_set (G_OBJECT (fakesink), "sync", FALSE, NULL); + /* Send 100 buffers per sec */ g_object_set (G_OBJECT (fakesrc), "silent", TRUE, "datarate", 100, "sizemax", 1, "sizetype", 2, NULL); diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml index fb831f6..87cad85 100644 --- a/docs/gst/tmpl/gstelement.sgml +++ b/docs/gst/tmpl/gstelement.sgml @@ -65,9 +65,6 @@ and gst_element_set_clock(). You can wait for the clock to reach a given - - - diff --git a/docs/gst/tmpl/gstenumtypes.sgml b/docs/gst/tmpl/gstenumtypes.sgml index 52ba68c..e9361f1 100644 --- a/docs/gst/tmpl/gstenumtypes.sgml +++ b/docs/gst/tmpl/gstenumtypes.sgml @@ -14,6 +14,3 @@ all gstreamer core related enumerations - - - diff --git a/docs/gst/tmpl/gstimplementsinterface.sgml b/docs/gst/tmpl/gstimplementsinterface.sgml index df7fb5f..5683450 100644 --- a/docs/gst/tmpl/gstimplementsinterface.sgml +++ b/docs/gst/tmpl/gstimplementsinterface.sgml @@ -14,9 +14,6 @@ Core interface implemented by #GstElements that allows runtime querying of inter - - - diff --git a/docs/gst/tmpl/gstindex.sgml b/docs/gst/tmpl/gstindex.sgml index 1eac0ee..74254d5 100644 --- a/docs/gst/tmpl/gstindex.sgml +++ b/docs/gst/tmpl/gstindex.sgml @@ -15,9 +15,6 @@ in a pipeline. #GstIndexFactory - - - diff --git a/docs/gst/tmpl/gstindexfactory.sgml b/docs/gst/tmpl/gstindexfactory.sgml index 7c86974..f458efd 100644 --- a/docs/gst/tmpl/gstindexfactory.sgml +++ b/docs/gst/tmpl/gstindexfactory.sgml @@ -14,9 +14,6 @@ GstIndexFactory is used to dynamically create GstIndex implementations. #GstIndex - - - The GstIndexFactory object diff --git a/docs/gst/tmpl/gstinfo.sgml b/docs/gst/tmpl/gstinfo.sgml index a8b3a38..59e5b43 100644 --- a/docs/gst/tmpl/gstinfo.sgml +++ b/docs/gst/tmpl/gstinfo.sgml @@ -68,9 +68,6 @@ categories. These are explained at GST_DEBUG_CATEGORY_INIT(). and environment variables that affect the debugging output. - - - The level defines the importance of a debugging message. The more important a diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml index 7baef0a..9a11e50 100644 --- a/docs/gst/tmpl/gstobject.sgml +++ b/docs/gst/tmpl/gstobject.sgml @@ -67,9 +67,6 @@ object. - - - diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml index 3c0d226..4998300 100644 --- a/docs/gst/tmpl/gstpad.sgml +++ b/docs/gst/tmpl/gstpad.sgml @@ -57,9 +57,6 @@ Last reviewed on December 13th, 2002 (0.5.0.1) #GstPadTemplate, #GstElement, #GstEvent - - - diff --git a/docs/gst/tmpl/gstpadtemplate.sgml b/docs/gst/tmpl/gstpadtemplate.sgml index 117ebb6..9ea3315 100644 --- a/docs/gst/tmpl/gstpadtemplate.sgml +++ b/docs/gst/tmpl/gstpadtemplate.sgml @@ -73,9 +73,6 @@ The following example shows you how to add the padtemplate to an elementfactory: #GstPad, #GstElementFactory - - - The padtemplate object. diff --git a/docs/gst/tmpl/gstpipeline.sgml b/docs/gst/tmpl/gstpipeline.sgml index a5010b8..15c5a6b 100644 --- a/docs/gst/tmpl/gstpipeline.sgml +++ b/docs/gst/tmpl/gstpipeline.sgml @@ -21,9 +21,6 @@ the pipeline, use gst_object_unref() to free its resources. #GstBin - - - diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml index 3e1cf62..6fd485e 100644 --- a/docs/gst/tmpl/gstplugin.sgml +++ b/docs/gst/tmpl/gstplugin.sgml @@ -35,9 +35,6 @@ to bring the plugin into memory. #GstPluginFeature, #GstType, #GstAutoplug, #GstElementFactory - - - Get the error quark diff --git a/docs/gst/tmpl/gstpluginfeature.sgml b/docs/gst/tmpl/gstpluginfeature.sgml index 04fc047..a257a56 100644 --- a/docs/gst/tmpl/gstpluginfeature.sgml +++ b/docs/gst/tmpl/gstpluginfeature.sgml @@ -14,9 +14,6 @@ This is a base class for anything that can be added to a #GstPlugin. #GstPlugin - - - diff --git a/docs/gst/tmpl/gsttypes.sgml b/docs/gst/tmpl/gsttypes.sgml index 136d62e..e1ca64c 100644 --- a/docs/gst/tmpl/gsttypes.sgml +++ b/docs/gst/tmpl/gsttypes.sgml @@ -14,9 +14,6 @@ various global enums and constants - - - diff --git a/docs/gst/tmpl/gstvalue.sgml b/docs/gst/tmpl/gstvalue.sgml index 299cf49..0e7aa44 100644 --- a/docs/gst/tmpl/gstvalue.sgml +++ b/docs/gst/tmpl/gstvalue.sgml @@ -14,9 +14,6 @@ GValue implementations specific to GStreamer - - - diff --git a/docs/libs/tmpl/gstdataprotocol.sgml b/docs/libs/tmpl/gstdataprotocol.sgml index c5446c9..0277c7c 100644 --- a/docs/libs/tmpl/gstdataprotocol.sgml +++ b/docs/libs/tmpl/gstdataprotocol.sgml @@ -27,9 +27,6 @@ network connections also need a protocol to do this. #GstBuffer, #GstCaps, #GstEvent - - - diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index 22741cc..2e72429 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -73,7 +73,6 @@ enum PROP_STATE_ERROR, PROP_SILENT, PROP_DUMP, - PROP_SYNC, PROP_SIGNAL_HANDOFFS, PROP_LAST_MESSAGE, PROP_CAN_ACTIVATE_PUSH, @@ -128,8 +127,6 @@ static GstFlowReturn gst_fake_sink_preroll (GstBaseSink * bsink, static GstFlowReturn gst_fake_sink_render (GstBaseSink * bsink, GstBuffer * buffer); static gboolean gst_fake_sink_event (GstBaseSink * bsink, GstEvent * event); -static void gst_fake_sink_get_times (GstBaseSink * bsink, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end); static guint gst_fake_sink_signals[LAST_SIGNAL] = { 0 }; @@ -165,9 +162,6 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass) g_param_spec_string ("last_message", "Last Message", "The message describing current status", DEFAULT_LAST_MESSAGE, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC, - g_param_spec_boolean ("sync", "Sync", "Sync on the clock", DEFAULT_SYNC, - G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIGNAL_HANDOFFS, g_param_spec_boolean ("signal-handoffs", "Signal handoffs", "Send a signal before unreffing the buffer", DEFAULT_SIGNAL_HANDOFFS, @@ -210,7 +204,6 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass) gstbase_sink_class->event = GST_DEBUG_FUNCPTR (gst_fake_sink_event); gstbase_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_fake_sink_preroll); gstbase_sink_class->render = GST_DEBUG_FUNCPTR (gst_fake_sink_render); - gstbase_sink_class->get_times = GST_DEBUG_FUNCPTR (gst_fake_sink_get_times); } static void @@ -218,7 +211,6 @@ gst_fake_sink_init (GstFakeSink * fakesink, GstFakeSinkClass * g_class) { fakesink->silent = DEFAULT_SILENT; fakesink->dump = DEFAULT_DUMP; - fakesink->sync = DEFAULT_SYNC; fakesink->last_message = g_strdup (DEFAULT_LAST_MESSAGE); fakesink->state_error = DEFAULT_STATE_ERROR; fakesink->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS; @@ -242,9 +234,6 @@ gst_fake_sink_set_property (GObject * object, guint prop_id, case PROP_DUMP: sink->dump = g_value_get_boolean (value); break; - case PROP_SYNC: - sink->sync = g_value_get_boolean (value); - break; case PROP_SIGNAL_HANDOFFS: sink->signal_handoffs = g_value_get_boolean (value); break; @@ -278,9 +267,6 @@ gst_fake_sink_get_property (GObject * object, guint prop_id, GValue * value, case PROP_DUMP: g_value_set_boolean (value, sink->dump); break; - case PROP_SYNC: - g_value_set_boolean (value, sink->sync); - break; case PROP_SIGNAL_HANDOFFS: g_value_set_boolean (value, sink->signal_handoffs); break; @@ -299,17 +285,6 @@ gst_fake_sink_get_property (GObject * object, guint prop_id, GValue * value, } } -static void -gst_fake_sink_get_times (GstBaseSink * bsink, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end) -{ - GstFakeSink *sink = GST_FAKE_SINK (bsink); - - if (sink->sync) { - GST_BASE_SINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); - } -} - static gboolean gst_fake_sink_event (GstBaseSink * bsink, GstEvent * event) { diff --git a/gst/elements/gstfakesink.h b/gst/elements/gstfakesink.h index aa13a1d..cfebdcf 100644 --- a/gst/elements/gstfakesink.h +++ b/gst/elements/gstfakesink.h @@ -59,7 +59,6 @@ struct _GstFakeSink { gboolean silent; gboolean dump; - gboolean sync; gboolean signal_handoffs; GstFakeSinkStateError state_error; gchar *last_message; diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 22741cc..2e72429 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -73,7 +73,6 @@ enum PROP_STATE_ERROR, PROP_SILENT, PROP_DUMP, - PROP_SYNC, PROP_SIGNAL_HANDOFFS, PROP_LAST_MESSAGE, PROP_CAN_ACTIVATE_PUSH, @@ -128,8 +127,6 @@ static GstFlowReturn gst_fake_sink_preroll (GstBaseSink * bsink, static GstFlowReturn gst_fake_sink_render (GstBaseSink * bsink, GstBuffer * buffer); static gboolean gst_fake_sink_event (GstBaseSink * bsink, GstEvent * event); -static void gst_fake_sink_get_times (GstBaseSink * bsink, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end); static guint gst_fake_sink_signals[LAST_SIGNAL] = { 0 }; @@ -165,9 +162,6 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass) g_param_spec_string ("last_message", "Last Message", "The message describing current status", DEFAULT_LAST_MESSAGE, G_PARAM_READABLE)); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SYNC, - g_param_spec_boolean ("sync", "Sync", "Sync on the clock", DEFAULT_SYNC, - G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIGNAL_HANDOFFS, g_param_spec_boolean ("signal-handoffs", "Signal handoffs", "Send a signal before unreffing the buffer", DEFAULT_SIGNAL_HANDOFFS, @@ -210,7 +204,6 @@ gst_fake_sink_class_init (GstFakeSinkClass * klass) gstbase_sink_class->event = GST_DEBUG_FUNCPTR (gst_fake_sink_event); gstbase_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_fake_sink_preroll); gstbase_sink_class->render = GST_DEBUG_FUNCPTR (gst_fake_sink_render); - gstbase_sink_class->get_times = GST_DEBUG_FUNCPTR (gst_fake_sink_get_times); } static void @@ -218,7 +211,6 @@ gst_fake_sink_init (GstFakeSink * fakesink, GstFakeSinkClass * g_class) { fakesink->silent = DEFAULT_SILENT; fakesink->dump = DEFAULT_DUMP; - fakesink->sync = DEFAULT_SYNC; fakesink->last_message = g_strdup (DEFAULT_LAST_MESSAGE); fakesink->state_error = DEFAULT_STATE_ERROR; fakesink->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS; @@ -242,9 +234,6 @@ gst_fake_sink_set_property (GObject * object, guint prop_id, case PROP_DUMP: sink->dump = g_value_get_boolean (value); break; - case PROP_SYNC: - sink->sync = g_value_get_boolean (value); - break; case PROP_SIGNAL_HANDOFFS: sink->signal_handoffs = g_value_get_boolean (value); break; @@ -278,9 +267,6 @@ gst_fake_sink_get_property (GObject * object, guint prop_id, GValue * value, case PROP_DUMP: g_value_set_boolean (value, sink->dump); break; - case PROP_SYNC: - g_value_set_boolean (value, sink->sync); - break; case PROP_SIGNAL_HANDOFFS: g_value_set_boolean (value, sink->signal_handoffs); break; @@ -299,17 +285,6 @@ gst_fake_sink_get_property (GObject * object, guint prop_id, GValue * value, } } -static void -gst_fake_sink_get_times (GstBaseSink * bsink, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end) -{ - GstFakeSink *sink = GST_FAKE_SINK (bsink); - - if (sink->sync) { - GST_BASE_SINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); - } -} - static gboolean gst_fake_sink_event (GstBaseSink * bsink, GstEvent * event) { diff --git a/plugins/elements/gstfakesink.h b/plugins/elements/gstfakesink.h index aa13a1d..cfebdcf 100644 --- a/plugins/elements/gstfakesink.h +++ b/plugins/elements/gstfakesink.h @@ -59,7 +59,6 @@ struct _GstFakeSink { gboolean silent; gboolean dump; - gboolean sync; gboolean signal_handoffs; GstFakeSinkStateError state_error; gchar *last_message; diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c index 616a393..326bcab 100644 --- a/tests/check/gst/gstevent.c +++ b/tests/check/gst/gstevent.c @@ -304,6 +304,8 @@ GST_START_TEST (send_custom_events) gst_bin_add_many (pipeline, fakesrc, queue, fakesink, NULL); fail_unless (gst_element_link_many (fakesrc, queue, fakesink, NULL)); + g_object_set (G_OBJECT (fakesink), "sync", FALSE, NULL); + /* Send 100 buffers per sec */ g_object_set (G_OBJECT (fakesrc), "silent", TRUE, "datarate", 100, "sizemax", 1, "sizetype", 2, NULL); -- 2.7.4