Consistent local or installed includes for interface headers.

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

19 files changed, 31 insertions, 27 deletions

diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index c7448f7c..b245f403 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -26,7 +26,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "raul/Path.hpp"
 #include "raul/PathTable.hpp"
 #include "raul/TableImpl.hpp"
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index 112922db..5481b713 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -23,7 +23,7 @@
 #include <list>
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/Connection.hpp"
+#include "ingen/Connection.hpp"
 #include "PortModel.hpp"
 
 namespace Ingen {
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 5e09d2e4..415ac8a1 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -25,7 +25,7 @@
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/Thread.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "serialisation/Parser.hpp"
 
 typedef struct _SoupSession SoupSession;
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 2b31701f..207d644f 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -25,7 +25,7 @@
 #include "raul/Path.hpp"
 #include "sord/sordmm.hpp"
 
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 
 typedef struct _SoupSession SoupSession;
 
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 1ff3cae6..6850b06c 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <cmath>
 #include "ingen-config.h"
-#include "interface/Port.hpp"
+#include "ingen/Port.hpp"
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "NodeModel.hpp"
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index 939197b1..cc47a25d 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -23,8 +23,8 @@
 #include <vector>
 #include <sigc++/sigc++.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/Node.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Node.hpp"
+#include "ingen/Port.hpp"
 #include "ObjectModel.hpp"
 #include "PortModel.hpp"
 #include "PluginModel.hpp"
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index bbf4f882..00d8cc32 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -15,13 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <list>
-#include <cassert>
-#include <cstring>
 #include <sstream>
-#include "ingen-config.h"
+
 #include "raul/log.hpp"
 #include "raul/AtomLiblo.hpp"
+
+#include "ingen-config.h"
 #include "OSCClientReceiver.hpp"
 
 #define LOG(s) s << "[OSCClientReceiver] "
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index e1bec2b6..9f9b8088 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -23,7 +23,7 @@
 #include <lo/lo.h>
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 42e2a09a..70b40e7d 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -19,9 +19,9 @@
 #include "raul/AtomLiblo.hpp"
 #include "raul/Path.hpp"
 
-#include "common/interface/Patch.hpp"
-#include "common/interface/Port.hpp"
-#include "common/interface/Plugin.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Port.hpp"
+#include "ingen/Plugin.hpp"
 
 #include "OSCEngineSender.hpp"
 
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index c696eb1b..fddfdbce 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <string>
 #include <lo/lo.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/OSCSender.hpp"
 
 namespace Ingen {
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 728d530e..16859216 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "raul/TableImpl.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "ObjectModel.hpp"
 
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 0899ed99..0ee11ba1 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -27,7 +27,7 @@
 #include "raul/Path.hpp"
 #include "raul/URI.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "shared/ResourceImpl.hpp"
 
 namespace Ingen {
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 534c329a..91719df3 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <sigc++/sigc++.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/Patch.hpp"
+#include "ingen/Patch.hpp"
 #include "NodeModel.hpp"
 
 #include "ConnectionModel.hpp"
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 006c53d9..6be9dfc4 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -26,8 +26,8 @@
 #ifdef HAVE_SLV2
 #include "slv2/slv2.h"
 #endif
-#include "interface/EngineInterface.hpp"
-#include "interface/Plugin.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/Plugin.hpp"
 #include "module/World.hpp"
 #include "shared/ResourceImpl.hpp"
 
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 8688e2e9..f41416f2 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -23,7 +23,7 @@
 #include <sigc++/sigc++.h>
 #include "raul/log.hpp"
 #include "raul/SharedPtr.hpp"
-#include "interface/Port.hpp"
+#include "ingen/Port.hpp"
 #include "ObjectModel.hpp"
 
 namespace Raul { class Path; }
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 55965fd2..8a53a2cb 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <sigc++/sigc++.h>
 #include "raul/Path.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/client/ThreadedSigClientInterface.cpp b/src/client/ThreadedSigClientInterface.cpp
index 13a36882..50b0b7e7 100644
--- a/src/client/ThreadedSigClientInterface.cpp
+++ b/src/client/ThreadedSigClientInterface.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "raul/log.hpp"
-#include "common/interface/Patch.hpp"
-#include "common/interface/Plugin.hpp"
-#include "common/interface/Port.hpp"
+#include "ingen/Patch.hpp"
+#include "ingen/Plugin.hpp"
+#include "ingen/Port.hpp"
 #include "ThreadedSigClientInterface.hpp"
 
 using namespace std;
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 06a8da73..c852dfd0 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -23,7 +23,7 @@
 #include <sigc++/sigc++.h>
 #include <glibmm/thread.h>
 #include "raul/Atom.hpp"
-#include "interface/ClientInterface.hpp"
+#include "ingen/ClientInterface.hpp"
 #include "SigClientInterface.hpp"
 #include "raul/SRSWQueue.hpp"
 
diff --git a/src/client/wscript b/src/client/wscript
index 496c7219..06258b67 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -30,7 +30,7 @@ def build(bld):
 			OSCEngineSender.cpp
 		'''
 
-	obj.includes        = ['.', '..', '../..', '../common']
+	obj.includes        = ['.', '..', '../..', '../../include']
 	obj.export_includes = ['.']
 	obj.name            = 'libingen_client'
 	obj.target          = 'ingen_client'