summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-18 15:58:07 +0000
committerDavid Robillard <d@drobilla.net>2011-02-18 15:58:07 +0000
commite2e782dcba57e89a7501810d3a4c948035165f62 (patch)
tree52600554dbb990778bf13af2e402e6f435194aa4 /src/client
parent05c2dfb6d677e5dc49c4de1ec568da4f69e3c877 (diff)
downloadingen-e2e782dcba57e89a7501810d3a4c948035165f62.tar.gz
ingen-e2e782dcba57e89a7501810d3a4c948035165f62.tar.bz2
ingen-e2e782dcba57e89a7501810d3a4c948035165f62.zip
Trim more cruft.
Fix running without loading a patch. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2989 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 010acb10..c5b09b8d 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -255,9 +255,7 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties)
for (iterator i = properties.begin(); i != properties.end(); ++i)
LOG(info) << " " << i->first << " = " << i->second << " :: " << i->second.type() << endl;
LOG(info) << "}" << endl;*/
-
- bool is_meta = ResourceImpl::is_meta_uri(uri);
-
+
// Check if uri is a plugin
const Atom& type = properties.find(_uris->rdf_type)->second;
if (type.type() == Atom::URI) {
@@ -266,10 +264,11 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties)
SharedPtr<PluginModel> p(new PluginModel(uris(), uri, type_uri, properties));
add_plugin(p);
return;
- } else {
}
}
+ bool is_meta = ResourceImpl::is_meta_uri(uri);
+
string path_str = is_meta ? (string("/") + uri.chop_start("#")) : uri.str();
if (!Path::is_valid(path_str)) {
LOG(error) << "Bad path: " << uri.str() << " - " << path_str << endl;
@@ -288,6 +287,10 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties)
PortType data_type(PortType::UNKNOWN);
ResourceImpl::type(uris(), properties, is_patch, is_node, is_port, is_output, data_type);
+ if (path.is_root()) {
+ is_patch = true;
+ }
+
if (is_patch) {
SharedPtr<PatchModel> model(new PatchModel(uris(), path));
model->set_properties(properties);
@@ -307,7 +310,7 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties)
n->set_properties(properties);
add_object(n);
} else {
- LOG(error) << "Plugin with no type" << endl;
+ LOG(warn) << "Node " << path << " has no plugin" << endl;
}
} else if (is_port) {
if (data_type != PortType::UNKNOWN) {