passthrough: Fix setting volume to unamplified again

Thanks to Tanu for pointing out the (possibly pathological?) case that
base_volume might be >0dB.
This commit is contained in:
Arun Raghavan 2011-08-26 09:51:07 +05:30
parent a13a402ed3
commit ed4a4480dc
2 changed files with 2 additions and 2 deletions

View file

@ -1406,7 +1406,7 @@ void pa_sink_enter_passthrough(pa_sink *s) {
s->saved_volume = *pa_sink_get_volume(s, TRUE);
s->saved_save_volume = s->save_volume;
pa_cvolume_set(&volume, s->sample_spec.channels, s->base_volume);
pa_cvolume_set(&volume, s->sample_spec.channels, PA_MIN(s->base_volume, PA_VOLUME_NORM));
pa_sink_set_volume(s, &volume, TRUE, FALSE);
}

View file

@ -986,7 +986,7 @@ void pa_source_enter_passthrough(pa_source *s) {
s->saved_volume = *pa_source_get_volume(s, TRUE);
s->saved_save_volume = s->save_volume;
pa_cvolume_set(&volume, s->sample_spec.channels, s->base_volume);
pa_cvolume_set(&volume, s->sample_spec.channels, PA_MIN(s->base_volume, PA_VOLUME_NORM));
pa_source_set_volume(s, &volume, TRUE, FALSE);
}