diff options
| author | Tanu Kaskinen <tanu.kaskinen@digia.com> | 2012-03-26 14:35:30 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2012-03-28 17:32:04 +0300 |
| commit | 5a26404f12045c37988f53e2cd25004539476ca7 (patch) | |
| tree | 0b6b368ca60d45a259d49a1bc7bc4aeb070cdd10 /src/modules/alsa/alsa-sink.c | |
| parent | 191d60688d18591acb3b0ddeafb870a2b1007429 (diff) | |
| download | pulseaudio-5a26404f12045c37988f53e2cd25004539476ca7.tar.gz | |
alsa: Fix SND_MIXER_SCHN_LAST related stuff.
Valid channel id range is from 0 to SND_MIXER_SCHN_LAST,
inclusive, so the size of the masks array in pa_alsa_element
has to be SND_MIXER_SCHN_LAST + 1. Similar "too small"
arrays were also in alsa-sink's and alsa-source's userdata,
but actually those arrays were not used at all so they were
removed.
element_is_subset() in alsa-mixer.c skipped the last channel
id when iterating the element masks array; that's now fixed
as well.
Thanks to David Henningsson for spotting the too small
arrays in alsa-sink and alsa-source and the
element_is_subset() problem.
Diffstat (limited to 'src/modules/alsa/alsa-sink.c')
| -rw-r--r-- | src/modules/alsa/alsa-sink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index c88f4cff8..ea5188c9e 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -140,8 +140,6 @@ struct userdata { pa_rtpoll_item *alsa_rtpoll_item; - snd_mixer_selem_channel_id_t mixer_map[SND_MIXER_SCHN_LAST]; - pa_smoother *smoother; uint64_t write_count; uint64_t since_start; |