Reorganize modules module (heh) to make a bit more sense. But not much.

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

13 files changed, 37 insertions, 28 deletions

diff --git a/src/libs/engine/Engine.hpp b/src/libs/engine/Engine.hpp
index 355d8c4d..ca8f4f78 100644
--- a/src/libs/engine/Engine.hpp
+++ b/src/libs/engine/Engine.hpp
@@ -23,7 +23,7 @@
 #include <vector>
 #include <boost/utility.hpp>
 #include <raul/SharedPtr.hpp>
-#include "module/module.h"
+#include "module/global.hpp"
 #include "interface/DataType.hpp"
 
 template<typename T> class Queue;
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 09d69e18..b2714e23 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -15,13 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NodeFactory.hpp"
 #include CONFIG_H_PATH
 #include <cstdlib>
 #include <pthread.h>
 #include <dirent.h>
 #include <float.h>
 #include <cmath>
+#include "module/World.hpp"
+#include "NodeFactory.hpp"
 #include "ThreadManager.hpp"
 #include "MidiNoteNode.hpp"
 #include "MidiTriggerNode.hpp"
diff --git a/src/libs/engine/NodeFactory.hpp b/src/libs/engine/NodeFactory.hpp
index 2dacc82a..a956a938 100644
--- a/src/libs/engine/NodeFactory.hpp
+++ b/src/libs/engine/NodeFactory.hpp
@@ -19,7 +19,7 @@
 #define NODEFACTORY_H
 
 #include CONFIG_H_PATH
-#include "module/module.h"
+#include "module/global.hpp"
 
 #include <list>
 #include <map>
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index ef81b0cc..fb185384 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -16,7 +16,6 @@
  */
 
 #include CONFIG_H_PATH
-#include "module/module.h"
 #include "App.hpp"
 #include <cassert>
 #include <string>
@@ -25,6 +24,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <raul/Path.hpp>
+#include "module/global.hpp"
+#include "module/Module.hpp"
+#include "module/World.hpp"
 #include "interface/EngineInterface.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp
index 20c1533c..c6020ead 100644
--- a/src/libs/gui/LoadRemotePatchWindow.cpp
+++ b/src/libs/gui/LoadRemotePatchWindow.cpp
@@ -15,16 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/module.h"
-#include "LoadRemotePatchWindow.hpp"
 #include <sys/types.h>
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include <raul/RDFQuery.hpp>
-#include "interface/EngineInterface.hpp"
 #include "client/PatchModel.hpp"
+#include "interface/EngineInterface.hpp"
+#include "module/World.hpp"
+#include "module/global.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
+#include "LoadRemotePatchWindow.hpp"
 #include "ThreadedLoader.hpp"
 
 using boost::optional;
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index a02235bf..07301aa4 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -16,7 +16,8 @@
  */
 
 #include CONFIG_H_PATH
-#include "module/module.h"
+#include "module/global.hpp"
+#include "module/World.hpp"
 
 #include <cassert>
 #include <flowcanvas/Canvas.hpp>
@@ -458,17 +459,17 @@ PatchCanvas::destroy_selection()
 void
 PatchCanvas::copy_selection()
 {
-	Serialiser serializer(*App::instance().world()->rdf_world);
-	serializer.start_to_string();
+	Serialiser serialiser(*App::instance().world()->rdf_world);
+	serialiser.start_to_string();
 
 	for (list<boost::shared_ptr<Item> >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) {
 		boost::shared_ptr<NodeModule> module = boost::dynamic_pointer_cast<NodeModule>(*m);
 		if (module) {
-			serializer.serialize(module->node());
+			serialiser.serialize(module->node());
 		} else {
 			boost::shared_ptr<PatchPortModule> port_module = boost::dynamic_pointer_cast<PatchPortModule>(*m);
 			if (port_module)
-				serializer.serialize(port_module->port());
+				serialiser.serialize(port_module->port());
 		}
 	}
 	
@@ -476,10 +477,10 @@ PatchCanvas::copy_selection()
 			c != _selected_connections.end(); ++c) {
 		boost::shared_ptr<Connection> connection = boost::dynamic_pointer_cast<Connection>(*c);
 		if (connection)
-			serializer.serialize_connection(connection->model());
+			serialiser.serialize_connection(connection->model());
 	}
 	
-	string result = serializer.finish();
+	string result = serialiser.finish();
 	
 	Glib::RefPtr<Gtk::Clipboard> clipboard = Gtk::Clipboard::get();
 	clipboard->set_text(result);
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp
index 11a2bcd7..3cac84f6 100644
--- a/src/libs/gui/ThreadedLoader.cpp
+++ b/src/libs/gui/ThreadedLoader.cpp
@@ -18,8 +18,9 @@
 #include <fstream>
 #include <cassert>
 #include <string>
+#include "module/global.hpp"
+#include "module/World.hpp"
 #include "client/PatchModel.hpp"
-#include "module/module.h"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
 using std::cout; using std::endl;
diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp
index a31f0cf0..b5e414a1 100644
--- a/src/libs/gui/UploadPatchWindow.cpp
+++ b/src/libs/gui/UploadPatchWindow.cpp
@@ -22,7 +22,8 @@
 #include <boost/optional/optional.hpp>
 #include <curl/curl.h>
 #include <raul/RDFQuery.hpp>
-#include "module/module.h"
+#include "module/global.hpp"
+#include "module/World.hpp"
 #include "interface/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/libs/gui/gui.hpp b/src/libs/gui/gui.hpp
index cc290851..fa31fe8d 100644
--- a/src/libs/gui/gui.hpp
+++ b/src/libs/gui/gui.hpp
@@ -19,7 +19,7 @@
 #define INGEN_GUI_H
 
 #include CONFIG_H_PATH
-#include "module/module.h"
+#include "module/global.hpp"
 #include <raul/SharedPtr.hpp>
 
 namespace Ingen {
diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am
index baebfea5..57219c85 100644
--- a/src/libs/module/Makefile.am
+++ b/src/libs/module/Makefile.am
@@ -5,8 +5,8 @@ libingen_module_la_CXXFLAGS = @RAUL_CFLAGS@ @SLV2_CFLAGS@ @GLIBMM_CFLAGS@ -DINGE
 libingen_module_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ @SLV2_LIBS@
 
 libingen_module_la_SOURCES = \
-	module.h \
-	module.cpp \
+	global.hpp \
+	global.cpp \
 	World.hpp \
 	Module.hpp \
 	Module.cpp
diff --git a/src/libs/module/module.cpp b/src/libs/module/global.cpp
index f19f9e46..15e844c1 100644
--- a/src/libs/module/module.cpp
+++ b/src/libs/module/global.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <iostream>
-#include "module.h"
+#include "global.hpp"
 #include "World.hpp"
 
 #include CONFIG_H_PATH
@@ -31,6 +31,7 @@ namespace Shared {
 
 static World* world = NULL;
 
+
 World*
 get_world()
 {
@@ -55,6 +56,7 @@ get_world()
 	return world;
 }
 
+
 void
 destroy_world()
 {
diff --git a/src/libs/module/module.h b/src/libs/module/global.hpp
index 4fe0d4cc..1aa46be6 100644
--- a/src/libs/module/module.h
+++ b/src/libs/module/global.hpp
@@ -15,21 +15,19 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_MODULE_H
-#define INGEN_MODULE_H
-
-#include "World.hpp"
-#include "Module.hpp"
-#include "raul/SharedPtr.hpp"
+#ifndef INGEN_GLOBAL_H
+#define INGEN_GLOBAL_H
 
 namespace Ingen {
 namespace Shared {
 
+class World;
+
 World* get_world();
 void   destroy_world();
 
 } // namesace Shared
 } // namespace Ingen
 
-#endif // INGEN_MODULE_H
+#endif // INGEN_GLOBAL_H
 
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp
index 31453315..f6400e2e 100644
--- a/src/progs/ingen/main.cpp
+++ b/src/progs/ingen/main.cpp
@@ -28,7 +28,9 @@
 #include <raul/Path.hpp>
 #include <raul/RDFWorld.hpp>
 #include <raul/SharedPtr.hpp>
-#include "module/module.h"
+#include "module/global.hpp"
+#include "module/Module.hpp"
+#include "module/World.hpp"
 #include "engine/Engine.hpp"
 #include "engine/QueuedEngineInterface.hpp"
 #include "serialisation/Loader.hpp"