diff options
| author | David Robillard <d@drobilla.net> | 2008-07-28 23:10:41 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-07-28 23:10:41 +0000 |
| commit | ed9e1aa15e5a9363653b46e12313878f82652393 (patch) | |
| tree | a0069d57b72070f12eed7255612caeb583637607 /src/libs | |
| parent | 80cdf6829d69f8878b406f9b9e6ca844f4ba7cc4 (diff) | |
| download | ingen-ed9e1aa15e5a9363653b46e12313878f82652393.tar.gz ingen-ed9e1aa15e5a9363653b46e12313878f82652393.tar.bz2 ingen-ed9e1aa15e5a9363653b46e12313878f82652393.zip | |
Fix loading patches from command line (partially).
git-svn-id: http://svn.drobilla.net/lad/ingen@1298 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/client/DeprecatedLoader.cpp | 1 | ||||
| -rw-r--r-- | src/libs/engine/NodeFactory.cpp | 19 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index 77d743eb..889ef6ed 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -383,7 +383,6 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr // Compatibility hacks for old patches that represent patch ports as nodes if (plugin_uri == "") { - cerr << "WARNING: Loading deprecated Node. Resave! " << path << endl; bool is_port = false; if (plugin_type == "Internal") { diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index 733dc6b1..949a5928 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -103,6 +103,8 @@ void NodeFactory::load_plugins() { assert(ThreadManager::current_thread_id() == THREAD_PRE_PROCESS); + + _world->rdf_world->mutex().lock(); // Only load if we havn't already, so every client connecting doesn't cause // this (expensive!) stuff to happen. Not the best solution - would be nice @@ -123,21 +125,8 @@ NodeFactory::load_plugins() _has_loaded = true; } -#if 0 - for (Plugins::const_iterator i = _plugins.begin(); i != _plugins.end(); ++i) { - assert(Path::is_valid_name(i->second->symbol())); - cerr << "PLUGIN: " << i->second->uri() << " - " << i->second->symbol() - << " (" << i->second->name() << ")" << endl; - PatchImpl* parent = new PatchImpl(*_world->local_engine, "dummy", 1, NULL, 1, 1, 1); - NodeImpl* node = i->second->instantiate("foo", 0, parent, 48000, 512); - if (node) - for (uint32_t i=0; i < node->num_ports(); ++i) { - cerr << "\t" << node->port(i)->name() << endl; - } - cerr << endl; - } -#endif - + _world->rdf_world->mutex().unlock(); + //cerr << "[NodeFactory] # Plugins: " << _plugins.size() << endl; } |