Move Shared::Module and Shared::World to shared directory.

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

41 files changed, 45 insertions, 66 deletions

diff --git a/src/bindings/ingen_bindings.cpp b/src/bindings/ingen_bindings.cpp
index fa365571..51c61a22 100644
--- a/src/bindings/ingen_bindings.cpp
+++ b/src/bindings/ingen_bindings.cpp
@@ -2,7 +2,7 @@
 #include "raul/log.hpp"
 #include "ingen_bindings.hpp"
 #include "engine/Engine.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 
 bool
 run(Ingen::Shared::World* world, const char* filename)
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index b6f1e856..3ba334b0 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -28,8 +28,7 @@
 
 #include "raul/log.hpp"
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "HTTPClientReceiver.hpp"
 
 #define LOG(s) s << "[HTTPClientReceiver] "
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 84448743..c426777d 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -21,7 +21,7 @@
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
 
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "HTTPEngineSender.hpp"
 #include "HTTPClientReceiver.hpp"
 
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 6850b06c..2d3f8f72 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -19,7 +19,7 @@
 #include <cmath>
 #include "ingen-config.h"
 #include "ingen/Port.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "NodeModel.hpp"
 
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 6be9dfc4..2776954c 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -28,7 +28,7 @@
 #endif
 #include "ingen/EngineInterface.hpp"
 #include "ingen/Plugin.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Ingen {
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index db98d54a..bb5198c6 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -17,8 +17,8 @@
 
 #include "ingen-config.h"
 #include "raul/SharedPtr.hpp"
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #ifdef HAVE_LIBLO
 #include "OSCEngineSender.hpp"
 #endif
diff --git a/src/engine/ControlBindings.cpp b/src/engine/ControlBindings.cpp
index 7b942008..c201ad30 100644
--- a/src/engine/ControlBindings.cpp
+++ b/src/engine/ControlBindings.cpp
@@ -19,7 +19,7 @@
 #include "raul/log.hpp"
 #include "raul/midi_events.h"
 #include "shared/LV2URIMap.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "events/SendPortValue.hpp"
 #include "events/SendBinding.hpp"
 #include "AudioBuffer.hpp"
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 3979cfa9..6a3d25a6 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -26,7 +26,7 @@
 #include "ingen/EventType.hpp"
 #include "events/CreatePatch.hpp"
 #include "events/CreatePort.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/Store.hpp"
diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp
index e5633c4c..7f92144f 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/engine/HTTPClientSender.cpp
@@ -21,7 +21,7 @@
 #include "raul/Atom.hpp"
 #include "raul/AtomRDF.hpp"
 #include "serialisation/Serialiser.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "HTTPClientSender.hpp"
 #include "Engine.hpp"
 
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index b2678754..d24c661b 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -27,7 +27,7 @@
 #include "raul/log.hpp"
 
 #include "ingen/ClientInterface.hpp"
-#include "module/Module.hpp"
+#include "shared/Module.hpp"
 #include "serialisation/Parser.hpp"
 #include "serialisation/Serialiser.hpp"
 
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 6b9e3f93..c807c098 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -47,7 +47,7 @@
 #include "ProcessSlave.hpp"
 #include "QueuedEvent.hpp"
 #include "ThreadManager.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "tuning.hpp"
diff --git a/src/engine/LV2Info.cpp b/src/engine/LV2Info.cpp
index e67c207d..ecbfe653 100644
--- a/src/engine/LV2Info.cpp
+++ b/src/engine/LV2Info.cpp
@@ -24,7 +24,7 @@
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
 
-#include "module/World.hpp"
+#include "shared/World.hpp"
 
 #include "LV2BlobFeature.hpp"
 #include "LV2EventFeature.hpp"
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 386eb057..ff502265 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -26,7 +26,7 @@
 #include <map>
 #include <string>
 #include "slv2/slv2.h"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 
 namespace Ingen {
 
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index 266a0271..8ed1dc81 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -25,7 +25,7 @@
 #include "sord/sordmm.hpp"
 #include "raul/log.hpp"
 #include "ingen-config.h"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "internals/Controller.hpp"
 #include "internals/Delay.hpp"
 #include "internals/Note.hpp"
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 1f53f6af..7a464e3b 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -25,7 +25,7 @@
 #include <glibmm/module.h>
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "ingen-config.h"
 
 namespace Ingen {
diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp
index c5f91ba5..eab1aed5 100644
--- a/src/engine/PatchImpl.cpp
+++ b/src/engine/PatchImpl.cpp
@@ -19,7 +19,7 @@
 #include <cmath>
 #include <string>
 #include "raul/log.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ThreadManager.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index fd0a9e1a..56285a60 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -21,7 +21,7 @@
 #include "shared/LV2URIMap.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2Atom.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "AudioBuffer.hpp"
 #include "ClientBroadcaster.hpp"
 #include "ControlBindings.hpp"
diff --git a/src/engine/ingen_engine.cpp b/src/engine/ingen_engine.cpp
index 2c728603..261de803 100644
--- a/src/engine/ingen_engine.cpp
+++ b/src/engine/ingen_engine.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #include "Engine.hpp"
 #include "QueuedEngineInterface.hpp"
 #include "util.hpp"
diff --git a/src/engine/ingen_http.cpp b/src/engine/ingen_http.cpp
index 6eb5cd9f..333131e6 100644
--- a/src/engine/ingen_http.cpp
+++ b/src/engine/ingen_http.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #include "HTTPEngineReceiver.hpp"
 #include "Engine.hpp"
 #include "tuning.hpp"
diff --git a/src/engine/ingen_jack.cpp b/src/engine/ingen_jack.cpp
index 77dfff55..074208b1 100644
--- a/src/engine/ingen_jack.cpp
+++ b/src/engine/ingen_jack.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #include "JackDriver.hpp"
 #include "Engine.hpp"
 
diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp
index f09540ed..1e0532b7 100644
--- a/src/engine/ingen_lv2.cpp
+++ b/src/engine/ingen_lv2.cpp
@@ -40,7 +40,7 @@
 #include "engine/QueuedEngineInterface.hpp"
 #include "engine/ThreadManager.hpp"
 #include "ingen/EngineInterface.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "serialisation/Parser.hpp"
 #include "shared/Configuration.hpp"
 #include "shared/runtime_paths.hpp"
diff --git a/src/engine/ingen_osc.cpp b/src/engine/ingen_osc.cpp
index d5cffdce..1a7df9fe 100644
--- a/src/engine/ingen_osc.cpp
+++ b/src/engine/ingen_osc.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #include "OSCEngineReceiver.hpp"
 #include "Engine.hpp"
 #include "tuning.hpp"
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index cd14d037..23924ded 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -27,7 +27,7 @@
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
 #include "flowcanvas/Connection.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "engine/Engine.hpp"
 #include "ingen/EngineInterface.hpp"
 #include "shared/runtime_paths.hpp"
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index e81576e2..e74a6168 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -27,7 +27,7 @@
 #include <libglademm.h>
 #include "raul/SharedPtr.hpp"
 #include "raul/Deletable.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 
 namespace Ingen {
 	class Engine;
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index e2872b90..a4bf3e43 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -26,8 +26,8 @@
 
 #include "ingen-config.h"
 #include "ingen/EngineInterface.hpp"
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 #include "engine/Engine.hpp"
 #ifdef HAVE_SOUP
 #include "client/HTTPClientReceiver.hpp"
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index d3b0f456..809bea42 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -20,7 +20,7 @@
 #include <boost/optional/optional.hpp>
 #include "client/PatchModel.hpp"
 #include "ingen/EngineInterface.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
 #include "LoadRemotePatchWindow.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index ce5de9d5..4df1e8dd 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -31,7 +31,7 @@
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
 #include "client/ClientStore.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
 #include "PatchWindow.hpp"
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index d6a7d86d..8e00f396 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <string>
 #include "raul/log.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index e6618c51..eb8a98b6 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -17,8 +17,8 @@
 
 #include <string>
 #include "raul/log.hpp"
-#include "module/World.hpp"
-#include "module/Module.hpp"
+#include "shared/World.hpp"
+#include "shared/Module.hpp"
 #include "serialisation/names.hpp"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index bce639b9..b5a4d291 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -21,7 +21,7 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include <curl/curl.h>
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
 #include "ingen/EngineInterface.hpp"
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index 9d0e995b..aee20831 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
+#include "shared/Module.hpp"
 #include "App.hpp"
 
 struct IngenGUIModule : public Ingen::Shared::Module {
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 65d316b7..4d55f212 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -39,7 +39,7 @@
 
 #include "engine/Engine.hpp"
 #include "ingen/EngineInterface.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "serialisation/Parser.hpp"
 #include "shared/Configuration.hpp"
 #include "shared/runtime_paths.hpp"
diff --git a/src/module/wscript b/src/module/wscript
deleted file mode 100644
index a904c806..00000000
--- a/src/module/wscript
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-from waflib.extras import autowaf as autowaf
-
-def build(bld):
-	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/module', bld.path.ant_glob('*.hpp'))
-
-	obj = bld(features = 'cxx cxxshlib')
-	obj.source = '''
-		World.cpp
-	'''
-	obj.export_includes = ['.']
-	obj.includes	    = ['.', '..', '../..', '../../include']
-	obj.name	    = 'libingen_module'
-	obj.target	    = 'ingen_module'
-	obj.vnum	    = '0.0.0'
-	obj.use             = 'libingen_shared'
-	obj.install_path    = '${LIBDIR}'
-	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL SORD')
-
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 0429b116..b81cc132 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -35,7 +35,7 @@
 #include "sord/sordmm.hpp"
 
 #include "ingen/EngineInterface.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 
 #include "Parser.hpp"
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index 0c8cc93c..a318e662 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -48,7 +48,7 @@
 #include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
 #include "ingen/Port.hpp"
-#include "module/World.hpp"
+#include "shared/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/ResourceImpl.hpp"
 
diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp
index a8cf75bd..a14e2d84 100644
--- a/src/serialisation/serialisation.cpp
+++ b/src/serialisation/serialisation.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/Module.hpp"
-#include "module/World.hpp"
+#include "shared/Module.hpp"
+#include "shared/World.hpp"
 
 #include "Parser.hpp"
 #include "Serialiser.hpp"
diff --git a/src/module/Module.hpp b/src/shared/Module.hpp
index af5732af..af5732af 100644
--- a/src/module/Module.hpp
+++ b/src/shared/Module.hpp
diff --git a/src/module/World.cpp b/src/shared/World.cpp
index 6667cb9f..6667cb9f 100644
--- a/src/module/World.cpp
+++ b/src/shared/World.cpp
diff --git a/src/module/World.hpp b/src/shared/World.hpp
index 29d904b2..29d904b2 100644
--- a/src/module/World.hpp
+++ b/src/shared/World.hpp
diff --git a/src/shared/wscript b/src/shared/wscript
index 811ed45e..4f03cf28 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -15,6 +15,7 @@ def build(bld):
 		LV2URIMap.cpp
 		ResourceImpl.cpp
 		Store.cpp
+		World.cpp
 		runtime_paths.cpp
 	'''
 	if bld.is_defined('HAVE_LIBLO'):
diff --git a/wscript b/wscript
index 6b4f72ef..335c6134 100644
--- a/wscript
+++ b/wscript
@@ -130,7 +130,6 @@ def build(bld):
 	# Modules
 	bld.recurse('src/engine')
 	bld.recurse('src/serialisation')
-	bld.recurse('src/module')
 	bld.recurse('src/shared')
 	bld.recurse('src/client')
 
@@ -143,7 +142,7 @@ def build(bld):
 	obj.source       = 'src/ingen/main.cpp'
 	obj.includes     = ['.', 'src', 'include']
 	obj.defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
-	obj.use          = 'libingen_module libingen_shared'
+	obj.use          = 'libingen_shared'
 	obj.install_path = '${BINDIR}'
 	autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL LV2CORE SLV2 INGEN LIBLO SOUP')