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/shared/ResourceImpl.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/shared/ResourceImpl.hpp')
-rw-r--r-- | src/shared/ResourceImpl.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp index b436ddc9..1f8dbedd 100644 --- a/src/shared/ResourceImpl.hpp +++ b/src/shared/ResourceImpl.hpp @@ -32,7 +32,7 @@ class ResourceImpl : virtual public Resource public: ResourceImpl(const Raul::URI& uri) : _uri(uri) {} - virtual const Raul::URI uri() const { return _uri.str(); } + virtual const Raul::URI uri() const { return _uri.str(); } const Properties& properties() const { return _properties; } Properties& properties() { return _properties; } @@ -40,6 +40,9 @@ public: const Raul::Atom& get_property(const Raul::URI& uri) const; void set_property(const Raul::URI& uri, const Raul::Atom& value); void add_property(const Raul::URI& uri, const Raul::Atom& value); + void merge_properties(const Properties& p); + + sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_property; /** Get the ingen type from a set of Properties. * If some coherent ingen type is found, true is returned and the appropriate @@ -51,9 +54,7 @@ public: bool& node, bool& port, bool& is_output, DataType& data_type); - void merge_properties(const Properties& p); - - sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_property; + static const Raul::URI meta_uri(const Raul::URI& base, const Raul::URI& uri); private: Raul::URI _uri; |