From 25c3ce9a7aeb80f500b8c6070c9ee2a1290ac0a9 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Wed, 14 Sep 2011 15:20:09 +0100 Subject: [PATCH] camerabin2: replace deprecated g_atomic_int_exchange_and_add It was replaced by g_atomic_int_add, which now returns the old value. https://bugzilla.gnome.org/show_bug.cgi?id=659061 --- gst/camerabin2/gstcamerabin2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c index aac9cc3d19..812f1bfddd 100644 --- a/gst/camerabin2/gstcamerabin2.c +++ b/gst/camerabin2/gstcamerabin2.c @@ -166,9 +166,15 @@ #include #include +#if GLIB_CHECK_VERSION(2,29,6) +#define gst_camerabin2_atomic_int_add g_atomic_int_add +#else +#define gst_camerabin2_atomic_int_add g_atomic_int_exchange_and_add +#endif + #define GST_CAMERA_BIN2_PROCESSING_INC(c) \ { \ - gint bef = g_atomic_int_exchange_and_add (&c->processing_counter, 1); \ + gint bef = gst_camerabin2_atomic_int_add (&c->processing_counter, 1); \ if (bef == 0) \ g_object_notify (G_OBJECT (c), "idle"); \ GST_DEBUG_OBJECT ((c), "Processing counter incremented to: %d", \