diff options
author | David Robillard <d@drobilla.net> | 2013-01-13 07:49:49 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-13 07:49:49 +0000 |
commit | 67a8adbc93991acfb688f378f52392995a272fac (patch) | |
tree | a4e629bd9c0d7da4cc5c7cb644b3352ca6f0dc78 /src/client/ClientObject.hpp | |
parent | 33aa54fa98783d1da2a322ee136c17df7f9c98a5 (diff) | |
download | machina-67a8adbc93991acfb688f378f52392995a272fac.tar.gz machina-67a8adbc93991acfb688f378f52392995a272fac.tar.bz2 machina-67a8adbc93991acfb688f378f52392995a272fac.zip |
Change model to have a single initial node.
Merge multiple recording into branches off the same initial node.
Make transport state sane with 3 distinct states.
Handle announcing objects several times correctly.
Don't send useless zero coordinates for new nodes, position in visible area.
Rewrite and clean up Machine code.
Update help.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4954 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/ClientObject.hpp')
-rw-r--r-- | src/client/ClientObject.hpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/client/ClientObject.hpp b/src/client/ClientObject.hpp index c9469ed..e823a64 100644 --- a/src/client/ClientObject.hpp +++ b/src/client/ClientObject.hpp @@ -51,22 +51,20 @@ public: typedef std::map<URIInt, Raul::Atom> Properties; const Properties& properties() { return _properties; } - SPtr<View> view() const { return _view; } - void set_view(SPtr<View> view) { _view = view; } + View* view() const { return _view; } + void set_view(View* view) { _view = view; } private: - uint64_t _id; - SPtr<View> _view; + uint64_t _id; + View* _view; Properties _properties; }; -class ClientObjectKey - : public ClientObject +/** Stub client object to use as a search key. */ +struct ClientObjectKey : public ClientObject { -public: - ClientObjectKey(uint64_t id) - : ClientObject(id) {} + ClientObjectKey(uint64_t id) : ClientObject(id) {} }; } |