diff --git a/ChangeLog b/ChangeLog index e31a894e54..10103186d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-21 Tim-Philipp Müller + + * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume): + Fix issues with mixer keeping state when muting/unmuting + and when changing the volume whilst muted (see #331763 + and #331765). + 2006-02-20 Tim-Philipp Müller * gst/subparse/gstsubparse.c: (subrip_unescape_formatting), diff --git a/common b/common index c30611ac38..c09cd18d32 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c30611ac38336030fed6d258c6e558cc537adbc5 +Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c index 8656924d83..f4cffea49a 100644 --- a/ext/alsa/gstalsamixer.c +++ b/ext/alsa/gstalsamixer.c @@ -309,9 +309,8 @@ gst_alsa_mixer_get_volume (GstAlsaMixer * mixer, GstMixerTrack * track, } else if (alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) { snd_mixer_selem_get_capture_volume (alsa_track->element, i, &tmp); } - if (!(track->flags & GST_MIXER_TRACK_MUTE)) { - volumes[i] = (gint) tmp; - } + + alsa_track->volumes[i] = volumes[i] = (gint) tmp; } } }