From 2f595631859574bfa7779ebb42f42b8590f5424c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 27 May 2009 23:21:34 +0000 Subject: 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 --- src/shared/ResourceImpl.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/shared/ResourceImpl.hpp') 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 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 signal_property; + static const Raul::URI meta_uri(const Raul::URI& base, const Raul::URI& uri); private: Raul::URI _uri; -- cgit v1.2.1