From: Wim Taymans <wim.taymans@gmail.com>
Date: Mon, 13 Mar 2006 15:17:45 +0000 (+0000)
Subject: gst/gstpipeline.c: Don't deadlock when reading properties.
X-Git-Tag: RELEASE-0_10_5~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9c44935866e5d98fa7d90750b2d59ba8b9e2a70;p=platform%2Fupstream%2Fgstreamer.git

gst/gstpipeline.c: Don't deadlock when reading properties.

Original commit message from CVS:
* gst/gstpipeline.c: (gst_pipeline_set_property),
(gst_pipeline_get_property), (do_pipeline_seek),
(gst_pipeline_change_state), (gst_pipeline_set_delay),
(gst_pipeline_get_delay):
Don't deadlock when reading properties.
---

diff --git a/ChangeLog b/ChangeLog
index 9258ed6..cb3da4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-03-13  Wim Taymans  <wim@fluendo.com>
 
+	* gst/gstpipeline.c: (gst_pipeline_set_property),
+	(gst_pipeline_get_property), (do_pipeline_seek),
+	(gst_pipeline_change_state), (gst_pipeline_set_delay),
+	(gst_pipeline_get_delay):
+	Don't deadlock when reading properties.
+
+2006-03-13  Wim Taymans  <wim@fluendo.com>
+
 	* libs/gst/base/gstbasetransform.c:
 	(gst_base_transform_class_init), (gst_base_transform_init),
 	(gst_base_transform_sink_event),
diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c
index 5d79235..759854a 100644
--- a/gst/gstpipeline.c
+++ b/gst/gstpipeline.c
@@ -270,7 +270,6 @@ gst_pipeline_set_property (GObject * object, guint prop_id,
 {
   GstPipeline *pipeline = GST_PIPELINE (object);
 
-  GST_OBJECT_LOCK (pipeline);
   switch (prop_id) {
     case PROP_DELAY:
       gst_pipeline_set_delay (pipeline, g_value_get_uint64 (value));
@@ -282,7 +281,6 @@ gst_pipeline_set_property (GObject * object, guint prop_id,
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
-  GST_OBJECT_UNLOCK (pipeline);
 }
 
 static void
@@ -291,7 +289,6 @@ gst_pipeline_get_property (GObject * object, guint prop_id,
 {
   GstPipeline *pipeline = GST_PIPELINE (object);
 
-  GST_OBJECT_LOCK (pipeline);
   switch (prop_id) {
     case PROP_DELAY:
       g_value_set_uint64 (value, gst_pipeline_get_delay (pipeline));
@@ -303,7 +300,6 @@ gst_pipeline_get_property (GObject * object, guint prop_id,
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
-  GST_OBJECT_UNLOCK (pipeline);
 }
 
 /* default pipeline seeking code: