diff options
author | David Robillard <d@drobilla.net> | 2009-05-27 23:21:34 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-05-27 23:21:34 +0000 |
commit | 2f595631859574bfa7779ebb42f42b8590f5424c (patch) | |
tree | c91c0cddcd93af991161c6cde4eceaaf45c5c8d5 /src/engine/GraphObjectImpl.hpp | |
parent | 20ff9af76b21b751ac29b354cf557e86b69c52f7 (diff) | |
download | ingen-2f595631859574bfa7779ebb42f42b8590f5424c.tar.gz ingen-2f595631859574bfa7779ebb42f42b8590f5424c.tar.bz2 ingen-2f595631859574bfa7779ebb42f42b8590f5424c.zip |
Remove 'property' vs 'variable' dichotomy in favour of 'meta objects' (to match serialisation).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2016 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/GraphObjectImpl.hpp')
-rw-r--r-- | src/engine/GraphObjectImpl.hpp | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp index a6f6b532..c8b0c13c 100644 --- a/src/engine/GraphObjectImpl.hpp +++ b/src/engine/GraphObjectImpl.hpp @@ -49,15 +49,17 @@ class GraphObjectImpl : virtual public Ingen::Shared::GraphObject public: virtual ~GraphObjectImpl() {} + const Raul::URI meta_uri() const { return _meta.uri(); } + const Raul::URI uri() const { return path(); } + const Raul::Symbol symbol() const { return _name; } + bool polyphonic() const { return _polyphonic; } virtual bool set_polyphonic(Raul::Maid& maid, bool p) { _polyphonic = p; return true; } - GraphObject* graph_parent() const { return _parent; } - - const Raul::URI uri() const { return path(); } - - inline GraphObjectImpl* parent() const { return _parent; } - const Raul::Symbol symbol() const { return _name; } + GraphObject* graph_parent() const { return _parent; } + GraphObjectImpl* parent() const { return _parent; } + Resource& meta() { return _meta; } + const Resource& meta() const { return _meta; } virtual void process(ProcessContext& context) = 0; @@ -68,18 +70,16 @@ public: assert(_name.find("/") == std::string::npos); } - const Raul::Atom& get_variable(const Raul::URI& key); - void set_variable(const Raul::URI& key, const Raul::Atom& value); - - const Properties& variables() const { return _variables; } - Properties& variables() { return _variables; } + const Raul::Atom& get_property(const Raul::URI& key) const; + void add_meta_property(const Raul::URI& key, const Raul::Atom& value); + void set_meta_property(const Raul::URI& key, const Raul::Atom& value); /** The Patch this object is a child of. */ virtual PatchImpl* parent_patch() const; /** Raul::Path is dynamically generated from parent to ease renaming */ const Raul::Path path() const { - if (_parent == NULL) + if (!_parent) return Raul::Path(std::string("/").append(_name)); else if (_parent->path().is_root()) return Raul::Path(std::string("/").append(_name)); @@ -90,22 +90,12 @@ public: SharedPtr<GraphObject> find_child(const std::string& name) const; protected: - GraphObjectImpl(GraphObjectImpl* parent, const std::string& name, bool polyphonic=false) - : ResourceImpl((parent ? parent->path().base() : Raul::Path::root_uri) + name) - , _parent(parent) - , _name(name) - , _polyphonic(polyphonic) - { - assert(parent == NULL || _name.length() > 0); - assert(_name.find("/") == std::string::npos); - } + GraphObjectImpl(GraphObjectImpl* parent, const std::string& name, bool polyphonic=false); GraphObjectImpl* _parent; std::string _name; + ResourceImpl _meta; bool _polyphonic; - -private: - Properties _variables; }; |