mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-22 14:06:23 +00:00
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.
This commit is contained in:
parent
1dcaa1fc4b
commit
e9c4493586
2 changed files with 8 additions and 4 deletions
|
@ -1,3 +1,11 @@
|
|||
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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue