VBAP panner should use Panner::_angles not its own private azi/ele members : now...

git-svn-id: svn://localhost/ardour2/branches/3.0@8093 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/vbap.h b/libs/ardour/ardour/vbap.h
index 620bd9d29770492996b4cdcc75069ad8aee32220..e3dc60c97ce05deaa7a031657c6f791c6d9df402 100644 (file)
--- a/libs/ardour/ardour/vbap.h
+++ b/libs/ardour/ardour/vbap.h
@@ -52,8 +52,6 @@ class VBAPanner : public StreamPanner {
        int load (std::istream&, std::string path, uint32_t&) { return 0; }
 
   private:
-        double _azimuth;   /* direction for the signal source */
-        double _elevation; /* elevation of the signal source */
         bool   _dirty;
         double gains[3];
         double desired_gains[3];

diff --git a/libs/ardour/vbap.cc b/libs/ardour/vbap.cc
index 31a8e6c1345bc0bd8b3419283eafc5afc833087e..7c2b8451391eced7ae443835234c1d3c3f348ae1 100644 (file)
--- a/libs/ardour/vbap.cc
+++ b/libs/ardour/vbap.cc
@@ -153,8 +153,8 @@ VBAPanner::do_distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coe
         bool was_dirty;
 
         if ((was_dirty = _dirty)) {
-                compute_gains (desired_gains, desired_outputs, _azimuth, _elevation);
-                cerr << " @ " << _azimuth << " /= " << _elevation
+                compute_gains (desired_gains, desired_outputs, _angles.azi, _angles.ele);
+                cerr << " @ " << _angles.azi << " /= " << _angles.ele
                      << " Outputs: "
                      << desired_outputs[0] + 1 << ' '
                      << desired_outputs[1] + 1 << ' '