diff options
author | David Robillard <d@drobilla.net> | 2008-08-18 03:49:35 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-08-18 03:49:35 +0000 |
commit | af759288a2517f9acf4c28f79d9c43be0086a221 (patch) | |
tree | b5852382a750fa5f8a6bc60f27edf9881960374f /src/libs/shared/Builder.cpp | |
parent | 77d608d6ca282795b348a615932b1abbd47b0472 (diff) | |
download | ingen-af759288a2517f9acf4c28f79d9c43be0086a221.tar.gz ingen-af759288a2517f9acf4c28f79d9c43be0086a221.tar.bz2 ingen-af759288a2517f9acf4c28f79d9c43be0086a221.zip |
More copy/paste and serialisation work.
Don't die on invalid path for set_property and set_variable (return error to client).
Working paste to subpatches, paste of connected patch ports and modules.
git-svn-id: http://svn.drobilla.net/lad/ingen@1428 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/shared/Builder.cpp')
-rw-r--r-- | src/libs/shared/Builder.cpp | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/src/libs/shared/Builder.cpp b/src/libs/shared/Builder.cpp index bc8fb21c..7065e0b4 100644 --- a/src/libs/shared/Builder.cpp +++ b/src/libs/shared/Builder.cpp @@ -36,46 +36,59 @@ Builder::Builder(CommonInterface& interface) void -Builder::build(SharedPtr<const GraphObject> object) +Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) { SharedPtr<const Patch> patch = PtrCast<const Patch>(object); if (patch) { - if (patch->path() != "/") - _interface.new_patch(patch->path(), patch->internal_polyphony()); - build_object(object); + if (object->path() != "/") { + const std::string path_str = prefix + object->path(); + //cout << "BUILDING PATCH " << path_str << endl; + _interface.new_patch(path_str, patch->internal_polyphony()); + } + + build_object(prefix, object); for (Patch::Connections::const_iterator i = patch->connections().begin(); i != patch->connections().end(); ++i) { - _interface.connect((*i)->src_port_path(), (*i)->dst_port_path()); + _interface.connect(prefix.base() + (*i)->src_port_path().substr(1), + prefix.base() + (*i)->dst_port_path().substr(1)); } return; } SharedPtr<const Node> node = PtrCast<const Node>(object); if (node) { - _interface.new_node(node->path(), node->plugin()->uri()); - build_object(object); + Raul::Path path = prefix.base() + node->path().substr(1); + //cout << "BUILDING NODE " << path << endl; + _interface.new_node(path, node->plugin()->uri()); + build_object(prefix, object); return; } SharedPtr<const Port> port = PtrCast<const Port>(object); if (port) { - _interface.new_port(port->path(), port->index(), port->type().uri(), !port->is_input()); - build_object(object); + Raul::Path path = prefix.base() + port->path().substr(1); + //cout << "BUILDING PORT " << path << endl; + _interface.new_port(path, port->index(), port->type().uri(), !port->is_input()); + build_object(prefix, object); return; } } void -Builder::build_object(SharedPtr<const GraphObject> object) +Builder::build_object(const Raul::Path& prefix, SharedPtr<const GraphObject> object) { for (GraphObject::Variables::const_iterator i = object->variables().begin(); i != object->variables().end(); ++i) - _interface.set_variable(object->path(), i->first, i->second); + _interface.set_variable(prefix.base() + object->path().substr(1), i->first, i->second); for (GraphObject::Properties::const_iterator i = object->properties().begin(); - i != object->properties().end(); ++i) - _interface.set_property(object->path(), i->first, i->second); + i != object->properties().end(); ++i) { + if (object->path() == "/") + continue; + string path_str = prefix.base() + object->path().substr(1); + _interface.set_property(prefix.base() + object->path().substr(1), i->first, i->second); + } } |