diff options
| author | Thomas Vander Stichele <thomas (at) apestaart (dot) org> | 2009-03-02 09:43:30 +0100 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas (at) apestaart (dot) org> | 2009-03-02 09:43:30 +0100 |
| commit | 9f25f96155b246663a1f900624ccda4b9eafcded (patch) | |
| tree | 029a4a4e8e96dc27e5f3ba38615bcfe9bee64455 /ext/pulse/pulsemixerctrl.c | |
| parent | 13221762d09f8faacfbd682e68500ff22e6eb8ab (diff) | |
| parent | 0083b9e40569db889500a3c1abd7ec3ac8876fee (diff) | |
Merge branch 'master' of ssh://thomasvs@git.freedesktop.org/git/gstreamer/gst-plugins-good
Diffstat (limited to 'ext/pulse/pulsemixerctrl.c')
| -rw-r--r-- | ext/pulse/pulsemixerctrl.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c index 41b68cfc..ae807c66 100644 --- a/ext/pulse/pulsemixerctrl.c +++ b/ext/pulse/pulsemixerctrl.c @@ -93,10 +93,11 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i, c->type = GST_PULSEMIXER_SINK; if (c->track) { - int i = g_atomic_int_get ((gint *) & c->track->flags); + GstMixerTrackFlags flags = c->track->flags; - i = (i & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); - g_atomic_int_set ((gint *) & c->track->flags, i); + flags = + (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); + c->track->flags = flags; } c->operation_success = 1; @@ -142,10 +143,11 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context, c->type = GST_PULSEMIXER_SOURCE; if (c->track) { - int i = g_atomic_int_get ((gint *) & c->track->flags); + GstMixerTrackFlags flags = c->track->flags; - i = (i & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); - g_atomic_int_set ((gint *) & c->track->flags, i); + flags = + (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); + c->track->flags = flags; } c->operation_success = 1; @@ -572,10 +574,11 @@ gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * c, GstMixerTrack * track, c->update_mute = TRUE; if (c->track) { - int i = g_atomic_int_get ((gint *) & c->track->flags); + GstMixerTrackFlags flags = c->track->flags; - i = (i & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); - g_atomic_int_set ((gint *) & c->track->flags, i); + flags = + (flags & ~GST_MIXER_TRACK_MUTE) | (c->muted ? GST_MIXER_TRACK_MUTE : 0); + c->track->flags = flags; } restart_time_event (c); |