diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-26 19:18:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-26 19:18:34 +0000 |
| commit | 1445bf5fc59dbca558d35b7bf7086e3032bbc7b4 (patch) | |
| tree | ac570b8821d282edb922921e16a28aae6b887a95 /libs/ardour | |
| parent | 5a0c8cd79c22bf2c4f54b9aa5e3d64be4535be1a (diff) | |
VBAP panner should use Panner::_angles not its own private azi/ele members : now actually pans but I'll be a muted frog on top of a woodshed if I can understand how the speaker pair selection process works (or doesn't)
git-svn-id: svn://localhost/ardour2/branches/3.0@8093 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/vbap.h | 2 | ||||
| -rw-r--r-- | libs/ardour/vbap.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/ardour/vbap.h b/libs/ardour/ardour/vbap.h index 620bd9d297..e3dc60c97c 100644 --- 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 31a8e6c134..7c2b845139 100644 --- 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 << ' ' |