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

sink, source: Join two ifs with the same condition.

Browse source 
Changes in v2:
 * Moved the comment in source.c to the right place.
This commit is contained in:
Tanu Kaskinen 2011-10-31 20:45:50 +02:00 • committed by Arun Raghavan
parent e310f4853e
commit 6f148787e0
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/sink.c
View file

@ -1943,13 +1943,7 @@ void pa_sink_set_volume(
} }
pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_sink->channel_map); pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_sink->channel_map);
}
/* If volume is NULL we synchronize the sink's real and reference
* volumes with the stream volumes. If it is not NULL we update
* the reference_volume with it. */
if (volume) {
if (update_reference_volume(root_sink, &new_reference_volume, &root_sink->channel_map, save)) { if (update_reference_volume(root_sink, &new_reference_volume, &root_sink->channel_map, save)) {
if (pa_sink_flat_volume_enabled(root_sink)) { if (pa_sink_flat_volume_enabled(root_sink)) {
/* OK, propagate this volume change back to the inputs */ /* OK, propagate this volume change back to the inputs */
@ -1962,6 +1956,9 @@ void pa_sink_set_volume(
} }
} else { } else {
/* If volume is NULL we synchronize the sink's real and
* reference volumes with the stream volumes. */
pa_assert(pa_sink_flat_volume_enabled(root_sink)); pa_assert(pa_sink_flat_volume_enabled(root_sink));
/* Ok, let's determine the new real volume */ /* Ok, let's determine the new real volume */

9
src/pulsecore/source.c
View file

@ -1508,13 +1508,7 @@ void pa_source_set_volume(
} }
pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_source->channel_map); pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_source->channel_map);
}
/* If volume is NULL we synchronize the source's real and reference
* volumes with the stream volumes. If it is not NULL we update
* the reference_volume with it. */
if (volume) {
if (update_reference_volume(root_source, &new_reference_volume, &root_source->channel_map, save)) { if (update_reference_volume(root_source, &new_reference_volume, &root_source->channel_map, save)) {
if (pa_source_flat_volume_enabled(root_source)) { if (pa_source_flat_volume_enabled(root_source)) {
/* OK, propagate this volume change back to the outputs */ /* OK, propagate this volume change back to the outputs */
@ -1527,6 +1521,9 @@ void pa_source_set_volume(
} }
} else { } else {
/* If volume is NULL we synchronize the source's real and
* reference volumes with the stream volumes. */
pa_assert(pa_source_flat_volume_enabled(root_source)); pa_assert(pa_source_flat_volume_enabled(root_source));
/* Ok, let's determine the new real volume */ /* Ok, let's determine the new real volume */