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

we need to make our multiplications with linear values

Browse source
This commit is contained in:
Lennart Poettering 2009-04-07 04:05:03 +02:00
parent 02686cce6d
commit 93e14d3e62
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pulsecore/sink.c
View file

@ -1071,7 +1071,7 @@ void pa_sink_propagate_flat_volume(pa_sink *s, const pa_cvolume *old_volume) {
* sink input volumes accordingly */ * sink input volumes accordingly */
for (i = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); i; i = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) { for (i = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); i; i = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) {
pa_cvolume remapped_old_volume, remapped_new_volume, fixed_volume; pa_cvolume remapped_old_volume, remapped_new_volume, new_virtual_volume;
unsigned c; unsigned c;
/* This basically calculates i->virtual_volume := i->virtual_volume * s->virtual_volume / old_volume */ /* This basically calculates i->virtual_volume := i->virtual_volume * s->virtual_volume / old_volume */
@ -1084,18 +1084,18 @@ void pa_sink_propagate_flat_volume(pa_sink *s, const pa_cvolume *old_volume) {
for (c = 0; c < i->sample_spec.channels; c++) for (c = 0; c < i->sample_spec.channels; c++)
if (remapped_old_volume.values[c] == PA_VOLUME_MUTED) if (remapped_old_volume.values[c] <= PA_VOLUME_MUTED)
fixed_volume.values[c] = remapped_new_volume.values[c]; new_virtual_volume.values[c] = remapped_new_volume.values[c];
else else
fixed_volume.values[c] = (pa_volume_t) new_virtual_volume.values[c] = pa_sw_volume_from_linear(
((uint64_t) i->virtual_volume.values[c] * pa_sw_volume_to_linear(i->virtual_volume.values[c]) *
(uint64_t) remapped_new_volume.values[c] / pa_sw_volume_to_linear(remapped_new_volume.values[c]) /
(uint64_t) remapped_old_volume.values[c]); pa_sw_volume_to_linear(remapped_old_volume.values[c]));
fixed_volume.channels = i->virtual_volume.channels; new_virtual_volume.channels = i->sample_spec.channels;
if (!pa_cvolume_equal(&fixed_volume, &i->virtual_volume)) { if (!pa_cvolume_equal(&new_virtual_volume, &i->virtual_volume)) {
i->virtual_volume = fixed_volume; i->virtual_volume = new_virtual_volume;
/* The virtual volume changed, let's tell people so */ /* The virtual volume changed, let's tell people so */
pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index); pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);