diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/ardour/ardour/speakers.h | |
parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/speakers.h')
-rw-r--r-- | libs/ardour/ardour/speakers.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/ardour/ardour/speakers.h b/libs/ardour/ardour/speakers.h index bae8cb96db..f6e6e22848 100644 --- a/libs/ardour/ardour/speakers.h +++ b/libs/ardour/ardour/speakers.h @@ -23,12 +23,15 @@ #include <iostream> #include <pbd/signals.h> +#include <pbd/stateful.h> #include "ardour/speaker.h" +class XMLNode; + namespace ARDOUR { -class Speakers { +class Speakers : public PBD::Stateful { public: Speakers (); virtual ~Speakers (); @@ -38,12 +41,17 @@ public: virtual void move_speaker (int id, const PBD::AngularVector& new_position); virtual void clear_speakers (); + void setup_default_speakers (uint32_t nspeakers); + std::vector<Speaker>& speakers() { return _speakers; } void dump_speakers (std::ostream&); - PBD::Signal0<void> Changed; + XMLNode& get_state (); + int set_state (const XMLNode&, int version); + PBD::Signal0<void> Changed; + protected: std::vector<Speaker> _speakers; |