Fix a bunch of memory leaks.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2429 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 14 insertions, 21 deletions

diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index 335feb26..28920d3c 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -137,26 +137,14 @@ NodeFactory::load_plugins()
 void
 NodeFactory::load_internal_plugins()
 {
-	// FIXME: This is a touch gross...
-
-	const SampleRate r = 48000;
-	const size_t     s = sizeof(Sample);
-
-	Engine& engine = *_world->local_engine;
-	PatchImpl* parent = new PatchImpl(engine, "dummy", 1, NULL, r, s, 1);
-
-	NodeImpl* n = NULL;
-	n = new NoteNode(*engine.buffer_factory(), "foo", 1, parent, r, s);
-	_plugins.insert(make_pair(n->plugin_impl()->uri(), n->plugin_impl()));
-	delete n;
-	n = new TriggerNode(*engine.buffer_factory(), "foo", 1, parent, r, s);
-	_plugins.insert(make_pair(n->plugin_impl()->uri(), n->plugin_impl()));
-	delete n;
-	n = new ControllerNode(*engine.buffer_factory(), "foo", 1, parent, r, s);
-	_plugins.insert(make_pair(n->plugin_impl()->uri(), n->plugin_impl()));
-	delete n;
-
-	delete parent;
+	InternalPlugin& note_plug = NoteNode::internal_plugin();
+	_plugins.insert(make_pair(note_plug.uri(), &note_plug));
+
+	InternalPlugin& trigger_plug = TriggerNode::internal_plugin();
+	_plugins.insert(make_pair(trigger_plug.uri(), &trigger_plug));
+
+	InternalPlugin& controller_plug = ControllerNode::internal_plugin();
+	_plugins.insert(make_pair(controller_plug.uri(), &controller_plug));
 }
 
 
@@ -238,8 +226,13 @@ NodeFactory::load_ladspa_plugins()
 				continue;
 
 			Glib::Module* plugin_library = new Glib::Module(lib_path, Glib::MODULE_BIND_LOCAL);
-			if (!plugin_library || !(*plugin_library))
+			if (!plugin_library)
+				continue;
+
+			if (!(*plugin_library)) {
+				delete plugin_library;
 				continue;
+			}
 
 			bool found = plugin_library->get_symbol("ladspa_descriptor", df.dp);
 			if (!found || !df.dp) {