mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

clip volume at PA_VOLUME_NORM for alsa devices

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@666 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-08 00:19:52 +00:00
parent 025228f957
commit a74253606f
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-alsa-sink.c
View file

@ -239,8 +239,14 @@ static int sink_set_hw_volume_cb(pa_sink *s) {
assert(u && u->mixer_elem);
if (snd_mixer_selem_has_playback_volume_joined(u->mixer_elem)) {
vol = pa_cvolume_avg(&s->hw_volume) * (u->hw_volume_max - u->hw_volume_min) /
vol = pa_cvolume_avg(&s->hw_volume);
if (vol > PA_VOLUME_NORM)
vol = PA_VOLUME_NORM;
vol = (vol * (u->hw_volume_max - u->hw_volume_min)) /
PA_VOLUME_NORM + u->hw_volume_min;
err = snd_mixer_selem_set_playback_volume_all(u->mixer_elem, vol);
if (err < 0)
goto fail;
@ -248,7 +254,12 @@ static int sink_set_hw_volume_cb(pa_sink *s) {
int i;
for (i = 0;i < s->hw_volume.channels;i++) {
vol = s->hw_volume.values[i] * (u->hw_volume_max - u->hw_volume_min) /
vol = s->hw_volume.values[i];
if (vol > PA_VOLUME_NORM)
vol = PA_VOLUME_NORM;
vol = (vol * (u->hw_volume_max - u->hw_volume_min)) /
PA_VOLUME_NORM + u->hw_volume_min;
err = snd_mixer_selem_set_playback_volume(u->mixer_elem, i, vol);
if (err < 0)

14
src/modules/module-alsa-source.c
View file

@ -228,7 +228,12 @@ static int source_set_hw_volume_cb(pa_source *s) {
assert(u && u->mixer_elem);
if (snd_mixer_selem_has_capture_volume_joined(u->mixer_elem)) {
vol = pa_cvolume_avg(&s->hw_volume) * (u->hw_volume_max - u->hw_volume_min) /
vol = pa_cvolume_avg(&s->hw_volume);
if (vol > PA_VOLUME_NORM)
vol = PA_VOLUME_NORM;
vol = vol * (u->hw_volume_max - u->hw_volume_min) /
PA_VOLUME_NORM + u->hw_volume_min;
err = snd_mixer_selem_set_capture_volume_all(u->mixer_elem, vol);
if (err < 0)
@ -237,7 +242,12 @@ static int source_set_hw_volume_cb(pa_source *s) {
int i;
for (i = 0;i < s->hw_volume.channels;i++) {
vol = s->hw_volume.values[i] * (u->hw_volume_max - u->hw_volume_min) /
vol = s->hw_volume.values[i];
if (vol > PA_VOLUME_NORM)
vol = PA_VOLUME_NORM;
vol = vol * (u->hw_volume_max - u->hw_volume_min) /
PA_VOLUME_NORM + u->hw_volume_min;
err = snd_mixer_selem_set_capture_volume(u->mixer_elem, i, vol);
if (err < 0)