Work around changes in g_atomic API

See #651514 for details.
This commit is contained in:
David Schleef 2011-06-04 14:04:44 -07:00
parent 76fad77149
commit 7b12d4647a
3 changed files with 12 additions and 1 deletions

View file

@ -1377,7 +1377,11 @@ gst_live_adder_request_new_pad (GstElement * element, GstPadTemplate * templ,
adder = GST_LIVE_ADDER (element);
/* increment pad counter */
#if GLIB_CHECK_VERSION(2,29,5)
padcount = g_atomic_int_add (&adder->padcount, 1);
#else
padcount = g_atomic_int_exchange_and_add (&adder->padcount, 1);
#endif
name = g_strdup_printf ("sink%d", padcount);
newpad = gst_pad_new_from_template (templ, name);

View file

@ -409,8 +409,11 @@ gst_mxf_mux_request_new_pad (GstElement * element,
GST_ERROR_OBJECT (mux, "Not our template");
return NULL;
}
#if GLIB_CHECK_VERSION(2,29,5)
pad_number = g_atomic_int_add ((gint *) & mux->n_pads, 1);
#else
pad_number = g_atomic_int_exchange_and_add ((gint *) & mux->n_pads, 1);
#endif
name = gst_mxf_mux_create_pad_name (templ, pad_number);
GST_DEBUG_OBJECT (mux, "Creating pad '%s'", name);

View file

@ -1183,7 +1183,11 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
goto could_not_add_sink;
else
/* increment pad counter */
#if GLIB_CHECK_VERSION(2,29,5)
padcount = g_atomic_int_add (&ssim->padcount, 1);
#else
padcount = g_atomic_int_exchange_and_add (&ssim->padcount, 1);
#endif
if (num >= 0) {
GstSSimOutputContext *c;