summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-05-11 21:51:47 +0000
committerDavid Robillard <d@drobilla.net>2009-05-11 21:51:47 +0000
commitfaf4db950721d5425bc8078d0fa6606e7064e69a (patch)
treecdd72f4910b5a59ea6097fadda768f31d7e6cf8c /src/client
parentcb5287d0379287c461a0ac5b950161244a7fa53b (diff)
downloadingen-faf4db950721d5425bc8078d0fa6606e7064e69a.tar.gz
ingen-faf4db950721d5425bc8078d0fa6606e7064e69a.tar.bz2
ingen-faf4db950721d5425bc8078d0fa6606e7064e69a.zip
Don't cause slv2 to load plugin data until a plugin is loaded or menu requested (faster startup).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1977 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp3
-rw-r--r--src/client/ClientStore.hpp2
-rw-r--r--src/client/SigClientInterface.hpp6
-rw-r--r--src/client/ThreadedSigClientInterface.hpp6
4 files changed, 8 insertions, 9 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 36156db8..2acb2124 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -419,11 +419,10 @@ ClientStore::rename(const Path& old_path, const Path& new_path)
}
void
-ClientStore::new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name)
+ClientStore::new_plugin(const string& uri, const string& type_uri, const string& symbol)
{
SharedPtr<PluginModel> p(new PluginModel(uri, type_uri));
p->set_property("lv2:symbol", Atom(Atom::STRING, symbol));
- p->set_property("doap:name", Atom(Atom::STRING, name));
add_plugin(p);
resolve_plugin_orphans(p);
}
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 97930955..9fb677ea 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -71,7 +71,7 @@ public:
void set_plugins(SharedPtr<Plugins> p) { _plugins = p; }
// CommonInterface
- void new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name);
+ void new_plugin(const string& uri, const string& type_uri, const string& symbol);
bool new_object(const Shared::GraphObject* object);
void new_patch(const string& path, uint32_t poly);
void new_node(const string& path, const string& plugin_uri);
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 05f027a4..580de7b2 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -54,7 +54,7 @@ public:
sigc::signal<void> signal_bundle_begin;
sigc::signal<void> signal_bundle_end;
sigc::signal<void, string> signal_error;
- sigc::signal<void, string, string, string, string> signal_new_plugin;
+ sigc::signal<void, string, string, string> signal_new_plugin;
sigc::signal<void, string, uint32_t> signal_new_patch;
sigc::signal<void, string, string> signal_new_node;
sigc::signal<void, string, string, uint32_t, bool> signal_new_port;
@@ -101,8 +101,8 @@ protected:
void error(const string& msg)
{ if (_enabled) signal_error.emit(msg); }
- void new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name)
- { if (_enabled) signal_new_plugin.emit(uri, type_uri, symbol, name); }
+ void new_plugin(const string& uri, const string& type_uri, const string& symbol)
+ { if (_enabled) signal_new_plugin.emit(uri, type_uri, symbol); }
bool new_object(const Shared::GraphObject* object)
{ if (_enabled) signal_new_object.emit(object); return false; }
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index b855dc33..ff4b202c 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -94,8 +94,8 @@ public:
void error(const string& msg)
{ push_sig(sigc::bind(error_slot, msg)); }
- void new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name)
- { push_sig(sigc::bind(new_plugin_slot, uri, type_uri, symbol, name)); }
+ void new_plugin(const string& uri, const string& type_uri, const string& symbol)
+ { push_sig(sigc::bind(new_plugin_slot, uri, type_uri, symbol)); }
bool new_object(const Shared::GraphObject* object);
@@ -161,7 +161,7 @@ private:
sigc::slot<void, int32_t> response_ok_slot;
sigc::slot<void, int32_t, string> response_error_slot;
sigc::slot<void, string> error_slot;
- sigc::slot<void, string, string, string, string> new_plugin_slot;
+ sigc::slot<void, string, string, string> new_plugin_slot;
sigc::slot<void, string, uint32_t> new_patch_slot;
sigc::slot<void, string, string> new_node_slot;
sigc::slot<void, string, string, uint32_t, bool> new_port_slot;