From 6f148787e0226fac47403a4a52160102269736a8 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 31 Oct 2011 20:45:50 +0200 Subject: [PATCH] sink, source: Join two ifs with the same condition. Changes in v2: * Moved the comment in source.c to the right place. --- src/pulsecore/sink.c | 9 +++------ src/pulsecore/source.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 454285f..eb67b47 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -1943,13 +1943,7 @@ void pa_sink_set_volume( } 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 (pa_sink_flat_volume_enabled(root_sink)) { /* OK, propagate this volume change back to the inputs */ @@ -1962,6 +1956,9 @@ void pa_sink_set_volume( } } 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)); /* Ok, let's determine the new real volume */ diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 6da6ef2..361780a 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -1508,13 +1508,7 @@ void pa_source_set_volume( } 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 (pa_source_flat_volume_enabled(root_source)) { /* OK, propagate this volume change back to the outputs */ @@ -1527,6 +1521,9 @@ void pa_source_set_volume( } } 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)); /* Ok, let's determine the new real volume */ -- 2.7.4