summaryrefslogtreecommitdiff
path: root/libs/panners
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-03-01 21:53:54 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-03-01 21:53:54 +0000
commitb69b9034339dbe3c1f890f237260e43672d4a3da (patch)
treef76434d4743eb47e5b9633508fc834b2d0bbc0ca /libs/panners
parent97b7b13ecc4e67df61f3970306151c65598fc630 (diff)
fix width handling in vbap panner
git-svn-id: svn://localhost/ardour2/branches/3.0@9013 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners')
-rw-r--r--libs/panners/vbap/vbap.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index b053b670f9..df1f5d0876 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -105,13 +105,13 @@ VBAPanner::update ()
double w = fabs (_pannable->pan_width_control->get_value()) * 360.0;
- double min_dir = center - w;
+ double min_dir = center - (w/2.0);
if (min_dir < 0) {
min_dir = 360.0 + min_dir; // its already negative
}
min_dir = max (min (min_dir, 360.0), 0.0);
- double max_dir = center + w;
+ double max_dir = center + (w/2.0);
if (max_dir > 360.0) {
max_dir = max_dir - 360.0;
}
@@ -125,6 +125,9 @@ VBAPanner::update ()
double signal_direction = min_dir;
if (w >= 0.0) {
+
+ /* positive width - normal order of signal spread */
+
for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) {
Signal* signal = *s;
@@ -134,6 +137,9 @@ VBAPanner::update ()
signal_direction += degree_step_per_signal;
}
} else {
+
+ /* inverted width - reverse order of signal spread */
+
for (vector<Signal*>::reverse_iterator s = _signals.rbegin(); s != _signals.rend(); ++s) {
Signal* signal = *s;