diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sys/oss4/oss4-mixer-slider.c | 10 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2008-05-08 Tim-Philipp Müller <tim.muller at collabora co uk> + + Based on patch by: Clive Wright <clive_wright ntlworld com> + + * sys/oss4/oss4-mixer-slider.c: (gst_oss4_mixer_slider_unpack_volume): + Apparently mono sliders have the mono value repeated in the upper bits, + so mask those out when reading them. Probably makes the mixer applet + work properly in some more cases. + 2008-05-08 Wim Taymans <wim.taymans@collabora.co.uk> Patch by: Olivier Crete <tester at tester dot ca> diff --git a/sys/oss4/oss4-mixer-slider.c b/sys/oss4/oss4-mixer-slider.c index a56dcae8..f8e7f661 100644 --- a/sys/oss4/oss4-mixer-slider.c +++ b/sys/oss4/oss4-mixer-slider.c @@ -96,11 +96,17 @@ gst_oss4_mixer_slider_unpack_volume (GstOss4MixerSlider * s, int v, val = (guint32) v; switch (s->mc->mixext.type) { - case MIXT_MONOSLIDER: - case MIXT_MONOSLIDER16: case MIXT_SLIDER: volumes[0] = val; break; + case MIXT_MONOSLIDER: + /* oss repeats the value in the upper bits, as if it was stereo */ + volumes[0] = val & 0x00ff; + break; + case MIXT_MONOSLIDER16: + /* oss repeats the value in the upper bits, as if it was stereo */ + volumes[0] = val & 0x0000ffff; + break; case MIXT_STEREOSLIDER: volumes[0] = (val & 0x00ff); volumes[1] = (val & 0xff00) >> 8; |