diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-03 14:14:54 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-03 14:14:54 +0100 |
| commit | 2cb971589d279169ac7a98a54910fba735b1d7d7 (patch) | |
| tree | 1e49d12f9542eb8dc8888110ed56cb1768c70ad2 /gst/gsttask.c | |
| parent | a1d82bec39304f246f6b5bd06c0c7951ca404373 (diff) | |
| download | gstreamer-2cb971589d279169ac7a98a54910fba735b1d7d7.tar.gz | |
task: don't use lock/unlock_full
Diffstat (limited to 'gst/gsttask.c')
| -rw-r--r-- | gst/gsttask.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gst/gsttask.c b/gst/gsttask.c index 818a3fab7b..b904fc9830 100644 --- a/gst/gsttask.c +++ b/gst/gsttask.c @@ -293,18 +293,13 @@ gst_task_func (GstTask * task) if (G_UNLIKELY (GET_TASK_STATE (task) == GST_TASK_PAUSED)) { GST_OBJECT_LOCK (task); while (G_UNLIKELY (GST_TASK_STATE (task) == GST_TASK_PAUSED)) { - gint t; + g_static_rec_mutex_unlock (lock); - t = g_static_rec_mutex_unlock_full (lock); - if (t <= 0) { - g_warning ("wrong STREAM_LOCK count %d", t); - } GST_TASK_SIGNAL (task); GST_TASK_WAIT (task); GST_OBJECT_UNLOCK (task); /* locking order.. */ - if (t > 0) - g_static_rec_mutex_lock_full (lock, t); + g_static_rec_mutex_lock (lock); GST_OBJECT_LOCK (task); if (G_UNLIKELY (GET_TASK_STATE (task) == GST_TASK_STOPPED)) { |