diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 01:25:22 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 01:25:22 +0000 |
commit | 13d91d1f6c63d2010c561bd54f1e6f68a0a745b5 (patch) | |
tree | 11cac36a2c86b5152669d8f3a57e23afce280495 /gst/gsttask.c | |
parent | 612abd89ddcbe41d55e5de66411e0159f7d85156 (diff) | |
download | gstreamer-13d91d1f6c63d2010c561bd54f1e6f68a0a745b5.tar.gz |
Use recent GLib API unconditionally now that we depend on the latest GLib
Diffstat (limited to 'gst/gsttask.c')
-rw-r--r-- | gst/gsttask.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gst/gsttask.c b/gst/gsttask.c index 444b292b84..2e5ce2b371 100644 --- a/gst/gsttask.c +++ b/gst/gsttask.c @@ -277,11 +277,7 @@ gst_task_func (GstTask * task) task->thread = tself; /* only update the priority when it was changed */ if (priv->prio_set) { -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_thread_set_priority (tself, priv->priority); -#else GST_INFO_OBJECT (task, "Thread priorities no longer have any effect"); -#endif } GST_OBJECT_UNLOCK (task); @@ -330,12 +326,6 @@ exit: GST_OBJECT_UNLOCK (task); priv->thr_callbacks.leave_thread (task, tself, priv->thr_user_data); GST_OBJECT_LOCK (task); - } else { - /* restore normal priority when releasing back into the pool, we will not - * touch the priority when a custom callback has been installed. */ -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_thread_set_priority (tself, G_THREAD_PRIORITY_NORMAL); -#endif } /* now we allow messing with the lock again by setting the running flag to * FALSE. Together with the SIGNAL this is the sign for the _join() to @@ -460,6 +450,7 @@ is_running: * * Since: 0.10.24 */ +/* FIXME 0.11: remove gst_task_set_priority() */ void gst_task_set_priority (GstTask * task, GThreadPriority priority) { @@ -477,11 +468,7 @@ gst_task_set_priority (GstTask * task, GThreadPriority priority) if (thread != NULL) { /* if this task already has a thread, we can configure the priority right * away, else we do that when we assign a thread to the task. */ -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_thread_set_priority (thread, priority); -#else GST_INFO_OBJECT (task, "Thread priorities no longer have any effect"); -#endif } GST_OBJECT_UNLOCK (task); } |