summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-18 15:37:36 +0000
committerDavid Robillard <d@drobilla.net>2011-02-18 15:37:36 +0000
commit05c2dfb6d677e5dc49c4de1ec568da4f69e3c877 (patch)
tree8d2ff26fa8eeec66777ae84c41a51c238137e402 /src/client
parentd3264c5685c90856379df368f131188c2af6ab09 (diff)
downloadingen-05c2dfb6d677e5dc49c4de1ec568da4f69e3c877.tar.gz
ingen-05c2dfb6d677e5dc49c4de1ec568da4f69e3c877.tar.bz2
ingen-05c2dfb6d677e5dc49c4de1ec568da4f69e3c877.zip
Trim more cruft.
Correctly receive data about plugins with hashes in their URIs. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2988 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp21
-rw-r--r--src/client/HTTPClientReceiver.cpp2
-rw-r--r--src/client/NodeModel.cpp2
-rw-r--r--src/client/wscript5
4 files changed, 14 insertions, 16 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 4ae2ff2d..010acb10 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -254,22 +254,19 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties)
/*LOG(info) << "PUT " << uri << " {" << endl;
for (iterator i = properties.begin(); i != properties.end(); ++i)
LOG(info) << " " << i->first << " = " << i->second << " :: " << i->second.type() << endl;
- LOG(info) << "}" << endl;*/
+ LOG(info) << "}" << endl;*/
- bool is_path = Path::is_valid(uri.str());
bool is_meta = ResourceImpl::is_meta_uri(uri);
- if (!(is_path || is_meta)) {
- const Atom& type = properties.find(_uris->rdf_type)->second;
- if (type.type() == Atom::URI) {
- const URI& type_uri = type.get_uri();
- if (Plugin::type_from_uri(type_uri) != Plugin::NIL) {
- SharedPtr<PluginModel> p(new PluginModel(uris(), uri, type_uri, properties));
- add_plugin(p);
- return;
- }
+ // Check if uri is a plugin
+ const Atom& type = properties.find(_uris->rdf_type)->second;
+ if (type.type() == Atom::URI) {
+ const URI& type_uri = type.get_uri();
+ if (Plugin::type_from_uri(type_uri) != Plugin::NIL) {
+ SharedPtr<PluginModel> p(new PluginModel(uris(), uri, type_uri, properties));
+ add_plugin(p);
+ return;
} else {
- LOG(error) << "Non-URI type " << type << endl;
}
}
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index bd16fe73..b6f1e856 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -138,7 +138,7 @@ HTTPClientReceiver::close_session()
void
HTTPClientReceiver::update(const std::string& str)
{
- LOG(info) << _world->parser()->parse_update(_world, _target.get(), str, _url);
+ //LOG(info) << _world->parser()->parse_update(_world, _target.get(), str, _url);
}
void
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 8d8a5ece..2ffd751d 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -198,8 +198,6 @@ NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float
max = _max_values[port->index()];
}
#endif
-
- // TODO: LADSPA support
}
diff --git a/src/client/wscript b/src/client/wscript
index 0cba8a8e..8a4540d0 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -25,7 +25,10 @@ def build(bld):
'''
if bld.env['HAVE_LIBLO'] == 1:
- obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
+ obj.source += '''
+ OSCClientReceiver.cpp
+ OSCEngineSender.cpp
+ '''
obj.includes = ['.', '..', '../..', '../common']
obj.export_includes = ['.']