summaryrefslogtreecommitdiff
path: root/libs/panners/vbap
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-02-24 18:55:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-02-24 18:55:33 +0000
commit5ad82b1e6d3a1b473137ab8b5f15ecf190eed51f (patch)
tree667407740e60ca0d5aed23660d726de56c868408 /libs/panners/vbap
parent0c5c1aafd06f24442f31f87de1fd1f51d6ce9291 (diff)
switch cartesian/spherical function names and make them use length. still a tweak needed here
git-svn-id: svn://localhost/ardour2/branches/3.0@8952 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners/vbap')
-rw-r--r--libs/panners/vbap/vbap.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 124b30bc30..eff8a5ee43 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -122,7 +122,6 @@ VBAPanner::update ()
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) {
@@ -153,7 +152,7 @@ VBAPanner::compute_gains (double gains[3], int speaker_ids[3], int azi, int ele)
double small_g;
double big_sm_g, gtmp[3];
- azi_ele_to_cart (azi,ele, cartdir[0], cartdir[1], cartdir[2]);
+ spherical_to_cartesian (azi, ele, 1.0, cartdir[0], cartdir[1], cartdir[2]);
big_sm_g = -100000.0;
gains[0] = gains[1] = gains[2] = 0;