ardour/livetrax
13
0
Fork 0
Code

fix width handling in vbap panner

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9013 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-01 21:53:54 +00:00
parent 97b7b13ecc
commit b69b903433
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/panners/vbap/vbap.cc
View File

@ -105,13 +105,13 @@ VBAPanner::update ()
double w = fabs (_pannable->pan_width_control->get_value()) * 360.0; 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) { if (min_dir < 0) {
min_dir = 360.0 + min_dir; // its already negative min_dir = 360.0 + min_dir; // its already negative
} }
min_dir = max (min (min_dir, 360.0), 0.0); 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) { if (max_dir > 360.0) {
max_dir = max_dir - 360.0; max_dir = max_dir - 360.0;
} }
@ -125,6 +125,9 @@ VBAPanner::update ()
double signal_direction = min_dir; double signal_direction = min_dir;
if (w >= 0.0) { if (w >= 0.0) {
/* positive width - normal order of signal spread */
for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) { for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) {
Signal* signal = *s; Signal* signal = *s;
@ -134,6 +137,9 @@ VBAPanner::update ()
signal_direction += degree_step_per_signal; signal_direction += degree_step_per_signal;
} }
} else { } else {
/* inverted width - reverse order of signal spread */
for (vector<Signal*>::reverse_iterator s = _signals.rbegin(); s != _signals.rend(); ++s) { for (vector<Signal*>::reverse_iterator s = _signals.rbegin(); s != _signals.rend(); ++s) {
Signal* signal = *s; Signal* signal = *s;