diff options
author | Robin Gareus <robin@gareus.org> | 2017-10-04 00:35:29 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-10-04 00:54:55 +0200 |
commit | e31f5d999837b0d0d63dc824c50e9da4acca7244 (patch) | |
tree | ef4712ccd25e8cc651ffabcd16e120571c21921d /libs/ardour/ardour/io.h | |
parent | 5dd9acf9ab39306277652c28fb5ac4af330e0af0 (diff) |
Clean up State API:
* Processor implement get_state(), classes derived from Processor
implement protected ::state() -- as documented in processor.h
* likewise for Route, Track: make ::state() a protected interface
* removal of "full_state", use explicit "template_save"
* use RAII/Unwind to skip saving automation-state
Diffstat (limited to 'libs/ardour/ardour/io.h')
-rw-r--r-- | libs/ardour/ardour/io.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 0eacaa973a..48f3653c2b 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -67,7 +67,7 @@ class UserBundle; */ class LIBARDOUR_API IO : public SessionObject, public Latent { - public: +public: static const std::string state_node_name; enum Direction { @@ -147,8 +147,8 @@ class LIBARDOUR_API IO : public SessionObject, public Latent */ PBD::Signal2<void, IOChange, void *> changed; - virtual XMLNode& state (bool full); XMLNode& get_state (void); + int set_state (const XMLNode&, int version); int set_state_2X (const XMLNode&, int, bool); static void prepare_for_reset (XMLNode&, const std::string&); @@ -205,17 +205,17 @@ class LIBARDOUR_API IO : public SessionObject, public Latent int set_ports (const std::string& str); - private: - mutable Glib::Threads::Mutex io_lock; +protected: + virtual XMLNode& state (); - protected: PortSet _ports; Direction _direction; DataType _default_type; bool _active; bool _sendish; - private: +private: + mutable Glib::Threads::Mutex io_lock; int connecting_became_legal (); PBD::ScopedConnection connection_legal_c; |