summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/engine/NodeFactory.cpp2
-rw-r--r--src/libs/engine/Plugin.h14
2 files changed, 4 insertions, 12 deletions
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 1214cc20..8386667b 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -306,7 +306,7 @@ NodeFactory::load_lv2_plugins()
}
}
- slv2_plugins_free(plugins);
+ slv2_plugins_free(_world, plugins);
}
diff --git a/src/libs/engine/Plugin.h b/src/libs/engine/Plugin.h
index d1a72fac..47faddc1 100644
--- a/src/libs/engine/Plugin.h
+++ b/src/libs/engine/Plugin.h
@@ -60,6 +60,7 @@ public:
#endif
{}
+#if 0
// FIXME: remove
Plugin() : _type(Internal), _lib_path("/Ingen"),
_id(0), _library(NULL)
@@ -68,16 +69,8 @@ public:
_slv2_plugin = NULL;
#endif
}
-
-#ifdef HAVE_SLV2
- ~Plugin()
- {
- if (_slv2_plugin)
- slv2_plugin_free(_slv2_plugin);
- }
#endif
-
Plugin(const Plugin* const copy) {
// Copying only allowed for Internal plugins. Bit of a hack, but
// allows the PluginInfo to be defined in the Node class which keeps
@@ -135,9 +128,8 @@ public:
// FIXME: ew
#ifdef HAVE_SLV2
- SLV2Plugin slv2_plugin() const { return _slv2_plugin; }
- void slv2_plugin(const SLV2Plugin p) { _slv2_plugin = slv2_plugin_duplicate(p); }
-
+ SLV2Plugin slv2_plugin() const { return _slv2_plugin; }
+ void slv2_plugin(SLV2Plugin p) { _slv2_plugin = p; }
#endif
Node* instantiate(const string& name, size_t poly, Ingen::Patch* parent, SampleRate srate, size_t buffer_size);