merge (with conflict fixes) with master (even against rgareus' recommendation)

[ardour.git] / libs / panners / vbap / vbap.cc

diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 23683fde08e1680a870594a23402e4fd3d833ddf..0de8d3a29af5c95c8ba7c11f4950ac4519ba9da9 100644 (file)
--- 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 ();