X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=subprojects%2Fgstreamer%2Fgst%2Fgstminiobject.c;h=18fdce072e9e81270c9735cac7f6579af180f182;hb=4aeb3def20a528436cbeb9906d537738bc098abf;hp=e980c89c40e794b25db2438bb4b1d5522b344a5b;hpb=f21e6cdab9f5107b839c700ad546cee15ca496cd;p=platform%2Fupstream%2Fgstreamer.git diff --git a/subprojects/gstreamer/gst/gstminiobject.c b/subprojects/gstreamer/gst/gstminiobject.c index e980c89..18fdce0 100644 --- a/subprojects/gstreamer/gst/gstminiobject.c +++ b/subprojects/gstreamer/gst/gstminiobject.c @@ -217,7 +217,7 @@ gst_mini_object_copy (const GstMiniObject * mini_object) gboolean gst_mini_object_lock (GstMiniObject * object, GstLockFlags flags) { - gint access_mode, state, newstate; + guint access_mode, state, newstate; g_return_val_if_fail (object != NULL, FALSE); g_return_val_if_fail (GST_MINI_OBJECT_IS_LOCKABLE (object), FALSE); @@ -228,9 +228,9 @@ gst_mini_object_lock (GstMiniObject * object, GstLockFlags flags) do { access_mode = flags & FLAG_MASK; - newstate = state = g_atomic_int_get (&object->lockstate); + newstate = state = (guint) g_atomic_int_get (&object->lockstate); - GST_CAT_TRACE (GST_CAT_LOCKING, "lock %p: state %08x, access_mode %d", + GST_CAT_TRACE (GST_CAT_LOCKING, "lock %p: state %08x, access_mode %u", object, state, access_mode); if (access_mode & GST_LOCK_FLAG_EXCLUSIVE) { @@ -265,7 +265,7 @@ gst_mini_object_lock (GstMiniObject * object, GstLockFlags flags) lock_failed: { GST_CAT_DEBUG (GST_CAT_LOCKING, - "lock failed %p: state %08x, access_mode %d", object, state, + "lock failed %p: state %08x, access_mode %u", object, state, access_mode); return FALSE; } @@ -281,16 +281,16 @@ lock_failed: void gst_mini_object_unlock (GstMiniObject * object, GstLockFlags flags) { - gint access_mode, state, newstate; + guint access_mode, state, newstate; g_return_if_fail (object != NULL); g_return_if_fail (GST_MINI_OBJECT_IS_LOCKABLE (object)); do { access_mode = flags & FLAG_MASK; - newstate = state = g_atomic_int_get (&object->lockstate); + newstate = state = (guint) g_atomic_int_get (&object->lockstate); - GST_CAT_TRACE (GST_CAT_LOCKING, "unlock %p: state %08x, access_mode %d", + GST_CAT_TRACE (GST_CAT_LOCKING, "unlock %p: state %08x, access_mode %u", object, state, access_mode); if (access_mode & GST_LOCK_FLAG_EXCLUSIVE) { @@ -423,8 +423,8 @@ gst_mini_object_is_writable (const GstMiniObject * mini_object) * * MT safe * - * Returns: (transfer full): a mini-object (possibly the same pointer) that - * is writable. + * Returns: (transfer full) (nullable): a writable mini-object (which may or may not be + * the same as @mini_object) or %NULL if copying is required but not possible. */ GstMiniObject * gst_mini_object_make_writable (GstMiniObject * mini_object)