From c37080eae184227a74e5c96237d6e7bf398fbf16 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 May 2009 21:17:44 +0000 Subject: Fix LADSPA names in plugin selection dialog. Fix request interface for non-graph objects (i.e. plugins). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2034 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/LADSPAPlugin.cpp | 1 + src/engine/QueuedEngineInterface.cpp | 7 +++++-- src/engine/events/RequestObjectEvent.hpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/engine') diff --git a/src/engine/LADSPAPlugin.cpp b/src/engine/LADSPAPlugin.cpp index 0b3aabdc..44df77b0 100644 --- a/src/engine/LADSPAPlugin.cpp +++ b/src/engine/LADSPAPlugin.cpp @@ -43,6 +43,7 @@ LADSPAPlugin::LADSPAPlugin( { set_property("rdf:type", Atom(Atom::URI, "ingen:LADSPAPlugin")); set_property("lv2:symbol", Atom(Atom::STRING, Symbol::symbolify(label))); + set_property("doap:name", Atom(Atom::STRING, name)); } diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 1ac9a1f1..8dd31adc 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -279,8 +279,11 @@ QueuedEngineInterface::request_property(const URI& uri, const URI& key) { size_t hash = uri.find("#"); bool meta = (hash != string::npos); - Path path = meta ? (string("/") + path.chop_start("/")) : uri.str(); - push_queued(new RequestMetadataEvent(_engine, _responder, now(), meta, path, key)); + const string path_str = string("/") + uri.chop_start("/"); + if (meta && Path::is_valid(path_str)) + push_queued(new RequestMetadataEvent(_engine, _responder, now(), meta, path_str, key)); + else + push_queued(new RequestMetadataEvent(_engine, _responder, now(), meta, uri, key)); } diff --git a/src/engine/events/RequestObjectEvent.hpp b/src/engine/events/RequestObjectEvent.hpp index 67454892..cd759224 100644 --- a/src/engine/events/RequestObjectEvent.hpp +++ b/src/engine/events/RequestObjectEvent.hpp @@ -27,7 +27,7 @@ class GraphObjectImpl; class PluginImpl; -/** A request from a client to send the value of a port. +/** A request from a client to send an object. * * \ingroup engine */ -- cgit v1.2.1