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/Builder.cpp | |
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/Builder.cpp')
-rw-r--r-- | src/shared/Builder.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index ba26d962..37c193fb 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -93,16 +93,12 @@ Builder::connect(SharedPtr<const GraphObject> object) void Builder::build_object(SharedPtr<const GraphObject> object) { - for (GraphObject::Properties::const_iterator i = object->variables().begin(); - i != object->variables().end(); ++i) - _interface.set_variable(object->path(), i->first, i->second); - - for (GraphObject::Properties::const_iterator i = object->properties().begin(); - i != object->properties().end(); ++i) { - if (object->path().is_root()) - continue; + typedef GraphObject::Properties::const_iterator iterator; + iterator i = object->meta().properties().begin(); + for (; i != object->meta().properties().end(); ++i) + _interface.set_property(object->meta().uri(), i->first, i->second); + for (i = object->properties().begin(); i != object->properties().end(); ++i) _interface.set_property(object->path(), i->first, i->second); - } } |