6 files changed, 123 insertions, 43 deletions
diff --git a/src/module/Module.hpp b/src/module/Module.hpp
index d078264f..c9ac198f 100644
--- a/src/module/Module.hpp
+++ b/src/module/Module.hpp
@@ -15,6 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef INGEN_MODULE_HPP
+#define INGEN_MODULE_HPP
+
 #include <string>
 #include <glibmm/module.h>
 #include "raul/SharedPtr.hpp"
@@ -22,14 +25,20 @@
 namespace Ingen {
 namespace Shared {
 
+class World;
 
-/** Load a dynamic module from the default path.
+/** A dynamically loaded Ingen module.
  *
- * \param name The base name of the module, e.g. "ingen_serialisation"
+ * All components of Ingen reside in one of these.
  */
-SharedPtr<Glib::Module> load_module(const std::string& name);
+struct Module {
+	virtual void load(Ingen::Shared::World* world) = 0;
+
+	SharedPtr<Glib::Module> library;
+};
 
 
 } // namespace Shared
 } // namespace Ingen
 
+#endif //INGEN_MODULE_HPP
diff --git a/src/module/Module.cpp b/src/module/World.cpp
index 2e2c71a7..0bc87459 100644
--- a/src/module/Module.cpp
+++ b/src/module/World.cpp
@@ -15,22 +15,19 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string>
-#include <sstream>
 #include <iostream>
 #include <glibmm/module.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include "ingen-config.h"
-#include "raul/SharedPtr.hpp"
 #include "shared/runtime_paths.hpp"
+#include "World.hpp"
 
 using namespace std;
 
 namespace Ingen {
 namespace Shared {
 
-
 /** Load a dynamic module from the default path.
  *
  * This will check in the directories specified in the environment variable
@@ -39,7 +36,7 @@ namespace Shared {
  *
  * \param name The base name of the module, e.g. "ingen_serialisation"
  */
-SharedPtr<Glib::Module>
+static SharedPtr<Glib::Module>
 load_module(const string& name)
 {
 	Glib::Module* module = NULL;
@@ -85,7 +82,65 @@ load_module(const string& name)
 	}
 }
 
+/** Load an Ingen module.
+ * @return true on success, false on failure
+ */
+bool
+World::load(const char* name)
+{
+	SharedPtr<Glib::Module> lib = load_module(name);
+	Ingen::Shared::Module* (*module_load)() = NULL;
+	if (lib->get_symbol("ingen_module_load", (void*&)module_load)) {
+		Module* module = module_load();
+		module->library = lib;
+		module->load(this);
+		modules.insert(make_pair(string(name), module));
+		return true;
+	} else {
+		cerr << "Failed to load module " << name << endl;
+		return false;
+	}
+}
+
+
+/** Unload all loaded Ingen modules.
+ */
+void
+World::unload_all()
+{
+	modules.clear();
+}
+
+
+/** Get an interface for a remote engine at @a url
+ */
+SharedPtr<Ingen::Shared::EngineInterface>
+World::interface(const std::string& url)
+{
+	const string scheme = url.substr(0, url.find(":"));
+	const InterfaceFactories::const_iterator i = interface_factories.find(scheme);
+	if (i == interface_factories.end()) {
+		cerr << "WARNING: Unknown URI scheme `'" << scheme << "'" << endl;
+		return SharedPtr<Ingen::Shared::EngineInterface>();
+	}
+
+	return i->second(this, url);
+}
+
+
+/** Run a script of type @a mime_type at filename @a filename */
+bool
+World::run(const std::string& mime_type, const std::string& filename)
+{
+	const ScriptRunners::const_iterator i = script_runners.find(mime_type);
+	if (i == script_runners.end()) {
+		cerr << "WARNING: Unknown script MIME type `'" << mime_type << "'" << endl;
+		return false;
+	}
+
+	return i->second(this, filename.c_str());
+}
+
 
 } // namespace Shared
 } // namespace Ingen
-
diff --git a/src/module/World.hpp b/src/module/World.hpp
index 27c9c764..e12ce5b2 100644
--- a/src/module/World.hpp
+++ b/src/module/World.hpp
@@ -18,8 +18,12 @@
 #ifndef INGEN_WORLD_HPP
 #define INGEN_WORLD_HPP
 
+#include <map>
+#include <string>
 #include <boost/shared_ptr.hpp>
 #include <glibmm/module.h>
+#include "raul/Configuration.hpp"
+#include "Module.hpp"
 
 typedef struct _SLV2World* SLV2World;
 
@@ -49,10 +53,22 @@ class LV2Features;
  * The Ingen System(TM) and whatnot.
  */
 struct World {
-	Redland::World* rdf_world;
+	World() : conf(0) {}
 
-    SLV2World    slv2_world;
-	LV2Features* lv2_features;
+	bool load(const char* name);
+	void unload_all();
+
+	SharedPtr<Ingen::Shared::EngineInterface> interface(const std::string& engine_url);
+
+	bool run(const std::string& mime_type, const std::string& filename);
+
+	int                  argc;
+	char**               argv;
+	Raul::Configuration* conf;
+
+	Redland::World*      rdf_world;
+    SLV2World            slv2_world;
+	LV2Features*         lv2_features;
 
     boost::shared_ptr<EngineInterface>           engine;
     boost::shared_ptr<Engine>                    local_engine;
@@ -60,7 +76,18 @@ struct World {
     boost::shared_ptr<Serialisation::Parser>     parser;
     boost::shared_ptr<Store>                     store;
 
-	boost::shared_ptr<Glib::Module> serialisation_module;
+private:
+	typedef std::map< const std::string, boost::shared_ptr<Module> > Modules;
+	Modules modules;
+
+	typedef SharedPtr<Ingen::Shared::EngineInterface> (*InterfaceFactory)(
+			World* world, const std::string& url);
+	typedef std::map<const std::string, InterfaceFactory> InterfaceFactories;
+	InterfaceFactories interface_factories;
+
+	typedef bool (*ScriptRunner)(World* world, const char* filename);
+	typedef std::map<const std::string, ScriptRunner> ScriptRunners;
+	ScriptRunners script_runners;
 };
 
 
diff --git a/src/module/ingen_module.cpp b/src/module/ingen_module.cpp
index c9a6d9d4..5faefebc 100644
--- a/src/module/ingen_module.cpp
+++ b/src/module/ingen_module.cpp
@@ -15,36 +15,30 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <iostream>
 #include "redlandmm/World.hpp"
 #include "shared/LV2Features.hpp"
 #include "ingen_module.hpp"
 #include "World.hpp"
-
 #include "ingen-config.h"
 #ifdef HAVE_SLV2
 #include "slv2/slv2.h"
 #endif
 
-using namespace std;
-
-namespace Ingen {
-namespace Shared {
-
-static World* world = NULL;
+extern "C" {
 
+static Ingen::Shared::World* world = NULL;
 
-World*
-get_world()
+Ingen::Shared::World*
+ingen_get_world()
 {
-    static World* world = NULL;
+    static Ingen::Shared::World* world = NULL;
 
 	if (!world) {
-		world = new World();
+		world = new Ingen::Shared::World();
         world->rdf_world = new Redland::World();
 #ifdef HAVE_SLV2
 		world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world());
-		world->lv2_features = new LV2Features();
+		world->lv2_features = new Ingen::Shared::LV2Features();
 		slv2_world_load_all(world->slv2_world);
 #endif
 		world->engine.reset();
@@ -54,11 +48,11 @@ get_world()
 	return world;
 }
 
-
 void
-destroy_world()
+ingen_destroy_world()
 {
 	if (world) {
+		world->unload_all();
 #ifdef HAVE_SLV2
 		slv2_world_free(world->slv2_world);
 		delete world->lv2_features;
@@ -69,7 +63,4 @@ destroy_world()
 	}
 }
 
-
-} // namesace Shared
-} // namespace Ingen
-
+} // extern "C"
diff --git a/src/module/ingen_module.hpp b/src/module/ingen_module.hpp
index ef373430..1095a3e6 100644
--- a/src/module/ingen_module.hpp
+++ b/src/module/ingen_module.hpp
@@ -15,19 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_GLOBAL_H
-#define INGEN_GLOBAL_H
+#ifndef INGEN_LIB_MODULE_HPP
+#define INGEN_LIB_MODULE_HPP
 
-namespace Ingen {
-namespace Shared {
+namespace Ingen { namespace Shared { class World; } }
 
-class World;
+extern "C" {
 
-World* get_world();
-void   destroy_world();
+Ingen::Shared::World* ingen_get_world();
+void                  ingen_destroy_world();
 
-} // namesace Shared
-} // namespace Ingen
+} // extern "C"
 
-#endif // INGEN_GLOBAL_H
+#endif // INGEN_LIB_MODULE_HPP
 
diff --git a/src/module/wscript b/src/module/wscript
index 318bf645..8553618f 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -7,7 +7,7 @@ def build(bld):
 
 	obj = bld.new_task_gen('cxx', 'shlib')
 	obj.source = '''
-		Module.cpp
+		World.cpp
 		ingen_module.cpp
 	'''
 	obj.export_incdirs = ['.']