diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-17 16:43:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-17 16:43:55 +0000 |
| commit | da144ab5edb5bb629a8300c2cbf93c7f87947a83 (patch) | |
| tree | dbb556f06c4667a820655895d704d60c98e690b4 /libs/panners/vbap/vbap_speakers.h | |
| parent | 97e2aedc2d8f9ba8b6100e9ddafa08fc9762c8f7 (diff) | |
more progress on speakers/vbap etc. etc (still a work in progress)
git-svn-id: svn://localhost/ardour2/branches/3.0@8887 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners/vbap/vbap_speakers.h')
| -rw-r--r-- | libs/panners/vbap/vbap_speakers.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/panners/vbap/vbap_speakers.h b/libs/panners/vbap/vbap_speakers.h index 8fe006ea1c..3bd298ba3d 100644 --- a/libs/panners/vbap/vbap_speakers.h +++ b/libs/panners/vbap/vbap_speakers.h @@ -43,20 +43,17 @@ public: int n_tuples () const { return _matrices.size(); } int dimension() const { return _dimension; } - static VBAPSpeakers& instance (Speakers&); + VBAPSpeakers (boost::shared_ptr<Speakers>); uint32_t n_speakers() const { return _speakers.size(); } ~VBAPSpeakers (); private: - static VBAPSpeakers* _instance; static const double MIN_VOL_P_SIDE_LGTH = 0.01; int _dimension; - std::vector<Speaker>& _speakers; + std::vector<Speaker> _speakers; PBD::ScopedConnection speaker_connection; - VBAPSpeakers (Speakers&); - struct azimuth_sorter { bool operator() (const Speaker& s1, const Speaker& s2) { return s1.angles().azi < s2.angles().azi; |