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

1 files changed, 4 insertions, 13 deletions

diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index c7e08269..408f303a 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -143,10 +143,10 @@ ClashAvoider::exists(const Raul::Path& path) const
 
 
 void
-ClashAvoider::put(const Raul::Path&                   path,
+ClashAvoider::put(const Raul::URI&                    path,
                   const Shared::Resource::Properties& properties)
 {
-	_target.put(map_path(path), properties);
+	_target.put(map_uri(path), properties);
 }
 
 
@@ -175,20 +175,11 @@ ClashAvoider::disconnect(const Raul::Path& src_port_path,
 
 
 void
-ClashAvoider::set_variable(const Raul::URI&  subject_path,
+ClashAvoider::set_property(const Raul::URI&  subject,
                            const Raul::URI&  predicate,
                            const Raul::Atom& value)
 {
-	_target.set_variable(map_uri(subject_path), predicate, value);
-}
-
-
-void
-ClashAvoider::set_property(const Raul::URI&  subject_path,
-                           const Raul::URI&  predicate,
-                           const Raul::Atom& value)
-{
-	_target.set_property(map_uri(subject_path), predicate, value);
+	_target.set_property(map_uri(subject), predicate, value);
 }