projects
/
profile
/
ivi
/
pulseaudio-panda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4ac6d0
)
fix multiplication of software pa_cvolumes
author
Lennart Poettering
<lennart@poettering.net>
Sun, 23 Apr 2006 19:46:16 +0000
(19:46 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 23 Apr 2006 19:46:16 +0000
(19:46 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@783
fefdeb5f
-60dc-0310-8127-
8f9354f1896f
src/polyp/volume.c
patch
|
blob
|
history
diff --git
a/src/polyp/volume.c
b/src/polyp/volume.c
index
0f15314
..
f10463c
100644
(file)
--- 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,