summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-23 19:46:16 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-23 19:46:16 +0000
commit4e61ebb981b218637685d7edbf7faac89916a094 (patch)
tree2f00b0a670a5edaa55538774fa9bb9071b8b6436
parentb4ac6d05d21742af2558acbdfebc83805750356f (diff)
fix multiplication of software pa_cvolumes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@783 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/polyp/volume.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/polyp/volume.c b/src/polyp/volume.c
index 0f153141..f10463c3 100644
--- a/src/polyp/volume.c
+++ b/src/polyp/volume.c
@@ -154,7 +154,7 @@ pa_cvolume *pa_sw_cvolume_multiply(pa_cvolume *dest, const pa_cvolume *a, const
assert(a);
assert(b);
- for (i = 0; i < a->channels || i < b->channels || i < PA_CHANNELS_MAX; i++) {
+ for (i = 0; i < a->channels && i < b->channels && i < PA_CHANNELS_MAX; i++) {
dest->values[i] = pa_sw_volume_multiply(
i < a->channels ? a->values[i] : PA_VOLUME_NORM,