From 2f595631859574bfa7779ebb42f42b8590f5424c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
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/client/ObjectModel.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/client/ObjectModel.hpp')

diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index f47bdfa6..321555fd 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -62,11 +62,13 @@ public:
 		signal_property.emit(key, value);
 	}
 
-	virtual void set_variable(const Raul::URI& key, const Raul::Atom& value) {
-		_variables.insert(make_pair(key, value));
-		signal_variable.emit(key, value);
+	virtual void set_meta_property(const Raul::URI& key, const Raul::Atom& value) {
+		_meta.set_property(key, value);
+		signal_property.emit(key, value);
 	}
 
+	Resource&              meta()             { return _meta; }
+	const Resource&        meta()       const { return _meta; }
 	const Properties&      variables()  const { return _variables; }
 	Properties&            variables()        { return _variables; }
 	const Raul::Path       path()       const { return _path; }
@@ -79,7 +81,6 @@ public:
 	// Signals
 	sigc::signal<void, SharedPtr<ObjectModel> >             signal_new_child;
 	sigc::signal<void, SharedPtr<ObjectModel> >             signal_removed_child;
-	sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_variable;
 	sigc::signal<void, const Raul::URI&, const Raul::Atom&> signal_property;
 	sigc::signal<void>                                      signal_destroyed;
 	sigc::signal<void>                                      signal_moved;
@@ -96,6 +97,7 @@ protected:
 
 	virtual void set(SharedPtr<ObjectModel> model);
 
+	ResourceImpl           _meta;
 	Raul::Path             _path;
 	SharedPtr<ObjectModel> _parent;
 
-- 
cgit v1.2.1