summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-15 20:20:58 +0000
committerDavid Robillard <d@drobilla.net>2011-04-15 20:20:58 +0000
commit42b469037c1b2bb55cd400a24cabfa29e7ae1ab2 (patch)
tree1b2e6310cb6fc7fe9b6066349d71ef1c1a9c829f /src/engine
parenta25b29c2e0843964ad82870c102857e3a83fad61 (diff)
downloadingen-42b469037c1b2bb55cd400a24cabfa29e7ae1ab2.tar.gz
ingen-42b469037c1b2bb55cd400a24cabfa29e7ae1ab2.tar.bz2
ingen-42b469037c1b2bb55cd400a24cabfa29e7ae1ab2.zip
Remove pointless module interface to ingen_module (World).
Having a dlopen interface to this code makes no sense since it must be linked against to load modules in the first place. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3146 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/ingen_lv2.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp
index b259de11..f09540ed 100644
--- a/src/engine/ingen_lv2.cpp
+++ b/src/engine/ingen_lv2.cpp
@@ -41,7 +41,6 @@
#include "engine/ThreadManager.hpp"
#include "ingen/EngineInterface.hpp"
#include "module/World.hpp"
-#include "module/ingen_module.hpp"
#include "serialisation/Parser.hpp"
#include "shared/Configuration.hpp"
#include "shared/runtime_paths.hpp"
@@ -258,9 +257,9 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
}
IngenPlugin* plugin = (IngenPlugin*)malloc(sizeof(IngenPlugin));
- plugin->world = ingen_world_new(&lib.conf, lib.argc, lib.argv);
+ plugin->world = new World(&lib.conf, lib.argc, lib.argv);
if (!plugin->world->load("ingen_serialisation")) {
- ingen_world_free(plugin->world);
+ delete plugin->world;
return NULL;
}
@@ -350,7 +349,7 @@ ingen_cleanup(LV2_Handle instance)
IngenPlugin* me = (IngenPlugin*)instance;
me->world->set_local_engine(SharedPtr<Ingen::Engine>());
me->world->set_engine(SharedPtr<Ingen::EngineInterface>());
- ingen_world_free(me->world);
+ delete me->world;
free(instance);
}
@@ -387,9 +386,9 @@ Lib::Lib()
Ingen::Shared::set_bundle_path_from_code((void*)&lv2_descriptor);
- Ingen::Shared::World* world = ingen_world_new(&conf, argc, argv);
+ Ingen::Shared::World* world = new Ingen::Shared::World(&conf, argc, argv);
if (!world->load("ingen_serialisation")) {
- ingen_world_free(world);
+ delete world;
return;
}
@@ -407,7 +406,7 @@ Lib::Lib()
i->file_uri)));
}
- ingen_world_free(world);
+ delete world;
}
/** Library destructor (called on shared library unload) */