summaryrefslogtreecommitdiff
path: root/libs/panners
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-02-24 04:28:48 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-02-24 04:28:48 +0000
commit0193803126111e78e1ce74285c2df9c593a3cebf (patch)
tree907411dbe4c4d2c16c5f57ab3cbd80a4388ad0d6 /libs/panners
parent7bfe5d6f4bc95e5141b20952d0c0d439fdffc947 (diff)
prettification of vbap/2d panner GUI. lots of details still to fix. also signal placement is now more correct although width is still not handled correctly
git-svn-id: svn://localhost/ardour2/branches/3.0@8948 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners')
-rw-r--r--libs/panners/vbap/vbap.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 99a83d4106..124b30bc30 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -105,14 +105,25 @@ VBAPanner::update ()
double w = fabs (_pannable->pan_width_control->get_value()) * 360.0;
double min_dir = center - w;
+ 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;
+ if (max_dir > 360.0) {
+ max_dir = max_dir - 360.0;
+ }
max_dir = max (min (max_dir, 360.0), 0.0);
- double degree_step_per_signal = (max_dir - min_dir) / _signals.size();
+ if (max_dir < min_dir) {
+ swap (max_dir, min_dir);
+ }
+
+ double degree_step_per_signal = (max_dir - min_dir) / (_signals.size() - 1);
double signal_direction = min_dir;
-
+ int x = 1;
+
for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) {
Signal* signal = *s;