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/ardour/ardour | |
| 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/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/panner.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/speakers.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 5e0ed991d6..75f9ea598c 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -162,7 +162,6 @@ class Panner : public PBD::Stateful, public PBD::ScopedConnectionList XMLNode& get_state (); - virtual void distribute_one (AudioBuffer&, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which) = 0; virtual void distribute_one_automated (AudioBuffer&, BufferSet& obufs, framepos_t start, framepos_t end, pframes_t nframes, @@ -176,7 +175,7 @@ extern "C" { std::string name; int32_t in; int32_t out; - ARDOUR::Panner* (*factory)(boost::shared_ptr<ARDOUR::Pannable>, ARDOUR::Speakers&); + ARDOUR::Panner* (*factory)(boost::shared_ptr<ARDOUR::Pannable>, boost::shared_ptr<ARDOUR::Speakers>); }; } diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 25b7b72fe4..dfa09fd357 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -716,7 +716,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* Speakers */ - Speakers& get_speakers (); + boost::shared_ptr<Speakers> get_speakers (); /* Controllables */ @@ -1478,7 +1478,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void start_time_changed (framepos_t); void end_time_changed (framepos_t); - Speakers* _speakers; + boost::shared_ptr<Speakers> _speakers; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/speakers.h b/libs/ardour/ardour/speakers.h index 0bee66af07..2bbfdadfa7 100644 --- a/libs/ardour/ardour/speakers.h +++ b/libs/ardour/ardour/speakers.h @@ -43,6 +43,7 @@ public: virtual void remove_speaker (int id); virtual void move_speaker (int id, const PBD::AngularVector& new_position); virtual void clear_speakers (); + uint32_t size() const { return _speakers.size(); } void setup_default_speakers (uint32_t nspeakers); |