mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to reduce volume updates in the ALSA sinks/sources: only touch the shadowed hw volme if necessary

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1189 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-07 16:50:15 +00:00
parent d953870564
commit 5d8ccfd839
2 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,20 +212,25 @@ static pa_usec_t sink_get_latency_cb(pa_sink *s) {
static int sink_get_hw_volume_cb(pa_sink *s) {
struct userdata *u = s->userdata;
long vol;
int err;
int i;
assert(u && u->mixer_elem);
assert(u);
assert(u->mixer_elem);
for (i = 0; i < s->hw_volume.channels; i++) {
long set_vol, vol;
for (i = 0;i < s->hw_volume.channels;i++) {
assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i));
err = snd_mixer_selem_get_playback_volume(u->mixer_elem, i, &vol);
if (err < 0)
if ((err = snd_mixer_selem_get_playback_volume(u->mixer_elem, i, &vol)) < 0)
goto fail;
s->hw_volume.values[i] =
(vol - u->hw_volume_min) * PA_VOLUME_NORM / (u->hw_volume_max - u->hw_volume_min);
set_vol = (long) roundf(((float) s->hw_volume.values[i] * (u->hw_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
/* Try to avoid superfluous volume changes */
if (set_vol != vol)
s->hw_volume.values[i] = (pa_volume_t) roundf(((float) (vol - u->hw_volume_min) * PA_VOLUME_NORM) / (u->hw_volume_max - u->hw_volume_min));
}
return 0;
@ -243,9 +248,12 @@ static int sink_set_hw_volume_cb(pa_sink *s) {
int i;
pa_volume_t vol;
assert(u && u->mixer_elem);
assert(u);
assert(u->mixer_elem);
for (i = 0;i < s->hw_volume.channels;i++) {
for (i = 0; i < s->hw_volume.channels; i++) {
long alsa_vol;
assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i));
vol = s->hw_volume.values[i];
@ -253,11 +261,9 @@ static int sink_set_hw_volume_cb(pa_sink *s) {
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;
alsa_vol = (long) roundf(((float) 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)
if ((err = snd_mixer_selem_set_playback_volume(u->mixer_elem, i, alsa_vol)) < 0)
goto fail;
}

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

@ -213,13 +213,18 @@ static int source_get_hw_volume_cb(pa_source *s) {
assert(u && u->mixer_elem);
for (i = 0;i < s->hw_volume.channels;i++) {
long set_vol;
assert(snd_mixer_selem_has_capture_channel(u->mixer_elem, i));
err = snd_mixer_selem_get_capture_volume(u->mixer_elem, i, &vol);
if (err < 0)
if ((err = snd_mixer_selem_get_capture_volume(u->mixer_elem, i, &vol)) < 0)
goto fail;
s->hw_volume.values[i] =
(vol - u->hw_volume_min) * PA_VOLUME_NORM / (u->hw_volume_max - u->hw_volume_min);
set_vol = (long) roundf(((float) s->hw_volume.values[i] * (u->hw_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
/* Try to avoid superfluous volume changes */
if (set_vol != vol)
s->hw_volume.values[i] = (pa_volume_t) roundf(((float) (vol - u->hw_volume_min) * PA_VOLUME_NORM) / (u->hw_volume_max - u->hw_volume_min));
}
return 0;
@ -247,10 +252,9 @@ static int source_set_hw_volume_cb(pa_source *s) {
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)
vol = (long) roundf(((float) vol * (u->hw_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
if ((err = snd_mixer_selem_set_capture_volume(u->mixer_elem, i, vol)) < 0)
goto fail;
}