summaryrefslogtreecommitdiff
path: root/libs/panners
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-01-14 10:56:17 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-01-14 10:56:17 -0500
commitcf806123ca5faaef483f898daba3f7bd38ec62eb (patch)
treef11f2f9ff64ea3b3682c81b8dd893ba0e9476445 /libs/panners
parentcfc9a1f22ea38d4dd6c619d6cec25fe29b1c2f48 (diff)
parentd9296b71237d9d3058b0796eda25258fadd45ad9 (diff)
merge (with conflict fixes) with master (even against rgareus' recommendation)
Diffstat (limited to 'libs/panners')
-rw-r--r--libs/panners/vbap/vbap.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 23683fde08..0de8d3a29a 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -477,7 +477,11 @@ void
VBAPanner::reset ()
{
set_position (0);
- set_width (1);
+ if (_signals.size() > 1) {
+ set_width (1.0 - (1.0 / (double)_signals.size()));
+ } else {
+ set_width (0);
+ }
set_elevation (0);
update ();