3 files changed, 167 insertions, 1 deletions
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 28a64578..8eb53b74 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -27,7 +27,7 @@
 #include "ingen/ServerInterface.hpp"
 #include "ingen/client/signal.hpp"
 #include "shared/ResourceImpl.hpp"
-#include "shared/World.hpp"
+#include "ingen/shared/World.hpp"
 
 namespace Ingen {
 
diff --git a/include/ingen/shared/Module.hpp b/include/ingen/shared/Module.hpp
new file mode 100644
index 00000000..f972a999
--- /dev/null
+++ b/include/ingen/shared/Module.hpp
@@ -0,0 +1,46 @@
+/* This file is part of Ingen.
+ * Copyright 2007-2011 David Robillard <http://drobilla.net>
+ *
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef INGEN_SHARED_MODULE_HPP
+#define INGEN_SHARED_MODULE_HPP
+
+#include <glibmm/module.h>
+
+#include "raul/SharedPtr.hpp"
+
+namespace Ingen {
+namespace Shared {
+
+class World;
+
+/** A dynamically loaded Ingen module.
+ *
+ * All components of Ingen reside in one of these.
+ */
+struct Module {
+	virtual ~Module();
+
+	virtual void load(Ingen::Shared::World* world) = 0;
+	virtual void run(Ingen::Shared::World* world) {}
+
+	SharedPtr<Glib::Module> library;
+};
+
+} // namespace Shared
+} // namespace Ingen
+
+#endif // INGEN_SHARED_MODULE_HPP
diff --git a/include/ingen/shared/World.hpp b/include/ingen/shared/World.hpp
new file mode 100644
index 00000000..4f0a00c2
--- /dev/null
+++ b/include/ingen/shared/World.hpp
@@ -0,0 +1,120 @@
+/* This file is part of Ingen.
+ * Copyright 2007-2011 David Robillard <http://drobilla.net>
+ *
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef INGEN_MODULE_WORLD_HPP
+#define INGEN_MODULE_WORLD_HPP
+
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
+
+#include "raul/Configuration.hpp"
+#include "raul/SharedPtr.hpp"
+
+typedef struct LilvWorldImpl LilvWorld;
+
+namespace Sord { class World; }
+
+namespace Ingen {
+
+class EngineBase;
+class ClientInterface;
+class ServerInterface;
+
+namespace Serialisation { class Serialiser; class Parser; }
+
+namespace Shared {
+
+class LV2Features;
+class LV2URIMap;
+class Store;
+
+/** The "world" all Ingen modules may share.
+ *
+ * All loaded components of Ingen, as well as things requiring shared access
+ * and/or locking (e.g. Sord, Lilv).
+ *
+ * Ingen modules are shared libraries which modify the World when loaded
+ * using World::load, e.g. loading the "ingen_serialisation" module will
+ * set World::serialiser and World::parser to valid objects.
+ */
+class World : public boost::noncopyable {
+public:
+	World(Raul::Configuration* conf, int& argc, char**& argv);
+	virtual ~World();
+
+	virtual bool load_module(const char* name);
+	virtual bool run_module(const char* name);
+
+	virtual void unload_modules();
+
+	typedef SharedPtr<ServerInterface> (*InterfaceFactory)(
+			World*                     world,
+			const std::string&         engine_url,
+			SharedPtr<ClientInterface> respond_to);
+
+	virtual void add_interface_factory(const std::string& scheme,
+	                                   InterfaceFactory   factory);
+
+	virtual SharedPtr<ServerInterface> interface(
+		const std::string&         engine_url,
+		SharedPtr<ClientInterface> respond_to);
+
+	virtual bool run(const std::string& mime_type,
+	                 const std::string& filename);
+
+	virtual void set_local_engine(SharedPtr<EngineBase> e);
+	virtual void set_engine(SharedPtr<ServerInterface> e);
+	virtual void set_serialiser(SharedPtr<Serialisation::Serialiser> s);
+	virtual void set_parser(SharedPtr<Serialisation::Parser> p);
+	virtual void set_store(SharedPtr<Store> s);
+	virtual void set_client(SharedPtr<ClientInterface> c);
+
+	virtual SharedPtr<EngineBase>                local_engine();
+	virtual SharedPtr<ServerInterface>           engine();
+	virtual SharedPtr<Serialisation::Serialiser> serialiser();
+	virtual SharedPtr<Serialisation::Parser>     parser();
+	virtual SharedPtr<Store>                     store();
+	virtual SharedPtr<ClientInterface>           client();
+
+	virtual Sord::World*         rdf_world();
+	virtual SharedPtr<LV2URIMap> uris();
+
+	virtual int&    argc();
+	virtual char**& argv();
+
+	virtual Raul::Configuration* conf();
+	virtual void set_conf(Raul::Configuration* c);
+
+	virtual LV2Features* lv2_features();
+
+	virtual LilvWorld* lilv_world();
+
+	virtual void        set_jack_uuid(const std::string& uuid);
+	virtual std::string jack_uuid();
+
+private:
+	class Pimpl;
+
+	Pimpl* _impl;
+};
+
+} // namespace Shared
+} // namespace Ingen
+
+#endif // INGEN_MODULE_WORLD_HPP