ext/alsa/gstalsamixer.c: Fix issues with mixer keeping state when muting/unmuting and when changing the volume whilst...

Original commit message from CVS:
* 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).
This commit is contained in:
Tim-Philipp Müller 2006-02-21 12:05:18 +00:00
parent 164a3128d5
commit 825496342e
3 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,10 @@
2006-02-21 Tim-Philipp Müller <tim at centricular dot net>
* 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 <tim at centricular dot net>
* gst/subparse/gstsubparse.c: (subrip_unescape_formatting),

2
common

@ -1 +1 @@
Subproject commit c30611ac38336030fed6d258c6e558cc537adbc5
Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd

View file

@ -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;
}
}
}