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

2 files changed, 5 insertions, 9 deletions

diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index 89a96978..e3c5998d 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -45,7 +45,7 @@ public:
 	/** End (and send) an atomic bundle */
 	virtual void bundle_end() = 0;
 
-	virtual void put(const Raul::Path&           path,
+	virtual void put(const Raul::URI&            uri,
 	                 const Resource::Properties& properties) = 0;
 
 	virtual void move(const Raul::Path& old_path,
@@ -59,11 +59,7 @@ public:
 	virtual void disconnect(const Raul::Path& src_port_path,
 	                        const Raul::Path& dst_port_path) = 0;
 
-	virtual void set_variable(const Raul::URI&  subject_path,
-	                          const Raul::URI&  predicate,
-	                          const Raul::Atom& value) = 0;
-
-	virtual void set_property(const Raul::URI&  subject_path,
+	virtual void set_property(const Raul::URI&  subject,
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value) = 0;
 
diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp
index edc1787e..fa2b75c6 100644
--- a/src/common/interface/GraphObject.hpp
+++ b/src/common/interface/GraphObject.hpp
@@ -45,15 +45,15 @@ class GraphObject : public Raul::Deletable
 public:
 	typedef Raul::PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator;
 
+	virtual const Resource& meta() const = 0;
+	virtual       Resource& meta()       = 0;
+
 	virtual void set_path(const Raul::Path& path) = 0;
 
 	virtual const Raul::Path   path()       const = 0;
 	virtual const Raul::Symbol symbol()     const = 0;
-	virtual const Properties&  variables()  const = 0;
-	virtual Properties&        variables()        = 0;
 	virtual bool               polyphonic() const = 0;
 
-	// FIXME: return WeakPtr, and stupid name
 	virtual GraphObject* graph_parent() const = 0;
 };