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

sink-input: Check flat volume with pa_sink_flat_volume_enabled().

Browse source 
Checking just the flag doesn't work if the sink uses volume sharing, because
such sinks never have PA_SINK_FLAT_VOLUME set.
This commit is contained in:
Tanu Kaskinen 2011-04-15 18:36:38 +03:00 • committed by Colin Guthrie
parent 0e60a80afa
commit a2581e6688
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/sink-input.c
View file

@ -1020,7 +1020,7 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, pa_boo
pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &i->sample_spec)); pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &i->sample_spec));
pa_assert(i->volume_writable); pa_assert(i->volume_writable);
if ((i->sink->flags & PA_SINK_FLAT_VOLUME) && !absolute) { if (!absolute && pa_sink_flat_volume_enabled(i->sink)) {
v = i->sink->reference_volume; v = i->sink->reference_volume;
pa_cvolume_remap(&v, &i->sink->channel_map, &i->channel_map); pa_cvolume_remap(&v, &i->sink->channel_map, &i->channel_map);
@ -1043,7 +1043,7 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, pa_boo
i->volume = *volume; i->volume = *volume;
i->save_volume = save; i->save_volume = save;
if (i->sink->flags & PA_SINK_FLAT_VOLUME) { if (pa_sink_flat_volume_enabled(i->sink)) {
/* We are in flat volume mode, so let's update all sink input /* We are in flat volume mode, so let's update all sink input
* volumes and update the flat volume of the sink */ * volumes and update the flat volume of the sink */