summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-21 19:54:57 +0000
committerDavid Robillard <d@drobilla.net>2011-10-21 19:54:57 +0000
commit3500ef73d4f668897df248a11bd631e11180045c (patch)
tree88e2bc8de5e1457b36192cc02b67656744b282e8 /src
parentad1e005cefb433b66aed1f5d82f9fe5171d197b3 (diff)
downloadingen-3500ef73d4f668897df248a11bd631e11180045c.tar.gz
ingen-3500ef73d4f668897df248a11bd631e11180045c.tar.bz2
ingen-3500ef73d4f668897df248a11bd631e11180045c.zip
Move more headers to shared include directory.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3566 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/client/ClientStore.cpp2
-rw-r--r--src/client/NodeModel.cpp2
-rw-r--r--src/client/ObjectModel.cpp2
-rw-r--r--src/client/PatchModel.cpp2
-rw-r--r--src/client/PluginModel.cpp2
-rw-r--r--src/client/PluginUI.cpp2
-rw-r--r--src/client/PortModel.cpp2
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/Configuration.cpp2
-rw-r--r--src/gui/ControlPanel.cpp2
-rw-r--r--src/gui/Controls.cpp2
-rw-r--r--src/gui/LoadPatchWindow.cpp2
-rw-r--r--src/gui/LoadPluginWindow.cpp2
-rw-r--r--src/gui/NewSubpatchWindow.cpp2
-rw-r--r--src/gui/NodeControlWindow.cpp2
-rw-r--r--src/gui/NodeMenu.cpp2
-rw-r--r--src/gui/NodeModule.cpp2
-rw-r--r--src/gui/ObjectMenu.cpp2
-rw-r--r--src/gui/PatchCanvas.cpp2
-rw-r--r--src/gui/PatchPortModule.cpp2
-rw-r--r--src/gui/PatchTreeWindow.cpp2
-rw-r--r--src/gui/PatchView.cpp2
-rw-r--r--src/gui/PatchWindow.cpp2
-rw-r--r--src/gui/Port.cpp2
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/PortPropertiesWindow.cpp2
-rw-r--r--src/gui/RenameWindow.cpp2
-rw-r--r--src/gui/SubpatchModule.cpp2
-rw-r--r--src/gui/UploadPatchWindow.cpp2
-rw-r--r--src/serialisation/Parser.cpp2
-rw-r--r--src/serialisation/Serialiser.cpp6
-rw-r--r--src/server/AudioBuffer.cpp3
-rw-r--r--src/server/BufferFactory.cpp2
-rw-r--r--src/server/ConnectionImpl.cpp2
-rw-r--r--src/server/ControlBindings.cpp2
-rw-r--r--src/server/ControlBindings.hpp2
-rw-r--r--src/server/DuplexPort.cpp2
-rw-r--r--src/server/Engine.cpp6
-rw-r--r--src/server/EngineStore.hpp2
-rw-r--r--src/server/GraphObjectImpl.hpp2
-rw-r--r--src/server/InputPort.cpp2
-rw-r--r--src/server/InternalPlugin.cpp2
-rw-r--r--src/server/JackDriver.cpp4
-rw-r--r--src/server/LV2Info.cpp2
-rw-r--r--src/server/LV2Node.cpp2
-rw-r--r--src/server/LV2Node.hpp2
-rw-r--r--src/server/LV2Plugin.cpp2
-rw-r--r--src/server/LV2RequestRunFeature.hpp2
-rw-r--r--src/server/LV2ResizeFeature.hpp2
-rw-r--r--src/server/Notification.cpp2
-rw-r--r--src/server/ObjectBuffer.cpp4
-rw-r--r--src/server/ObjectSender.cpp2
-rw-r--r--src/server/OutputPort.cpp2
-rw-r--r--src/server/PatchImpl.cpp2
-rw-r--r--src/server/PluginImpl.hpp2
-rw-r--r--src/server/PortImpl.cpp2
-rw-r--r--src/server/events/CreateNode.cpp2
-rw-r--r--src/server/events/CreatePatch.cpp2
-rw-r--r--src/server/events/CreatePort.cpp2
-rw-r--r--src/server/events/RegisterClient.cpp2
-rw-r--r--src/server/events/SetMetadata.cpp2
-rw-r--r--src/server/events/SetMetadata.hpp2
-rw-r--r--src/server/events/SetPortValue.cpp4
-rw-r--r--src/server/internals/Controller.cpp2
-rw-r--r--src/server/internals/Delay.cpp2
-rw-r--r--src/server/internals/Note.cpp2
-rw-r--r--src/server/internals/Trigger.cpp2
-rw-r--r--src/shared/Builder.cpp2
-rw-r--r--src/shared/ClashAvoider.cpp3
-rw-r--r--src/shared/LV2Atom.cpp5
-rw-r--r--src/shared/LV2Features.cpp4
-rw-r--r--src/shared/LV2Features.hpp77
-rw-r--r--src/shared/LV2URIMap.cpp6
-rw-r--r--src/shared/LV2URIMap.hpp71
-rw-r--r--src/shared/ResourceImpl.cpp4
-rw-r--r--src/shared/ResourceImpl.hpp87
-rw-r--r--src/shared/Store.cpp2
-rw-r--r--src/shared/Store.hpp59
-rw-r--r--src/shared/World.cpp4
79 files changed, 87 insertions, 386 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 90c23d15..7dbc5b0e 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -18,7 +18,7 @@
#include "raul/log.hpp"
#include "raul/PathTable.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/ConnectionModel.hpp"
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 007cd424..f140057c 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -20,7 +20,7 @@
#include "ingen/Port.hpp"
#include "ingen/shared/World.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
using namespace std;
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 240e2ca5..984cd11c 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -17,7 +17,7 @@
#include "raul/TableImpl.hpp"
#include "ingen/GraphObject.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/ObjectModel.hpp"
using namespace std;
diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index 1e02e747..0d2e74e3 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "raul/log.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/NodeModel.hpp"
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index a280a038..6f3c3ff8 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -22,7 +22,7 @@
#include "raul/Atom.hpp"
#include "raul/Path.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/PluginModel.hpp"
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 0e0c3c51..5c26cfe6 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -22,7 +22,7 @@
#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h"
#include "ingen/shared/LV2Atom.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PluginUI.hpp"
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index 3d84de53..c017287f 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PortModel.hpp"
#include "ingen/client/NodeModel.hpp"
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 6608df17..4ed01931 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -36,7 +36,7 @@
#include "raul/log.hpp"
#include "server/Engine.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/shared/World.hpp"
#include "App.hpp"
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index 855c991f..8358dc34 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -24,7 +24,7 @@
#include "ingen/client/PortModel.hpp"
#include "ingen/client/PluginModel.hpp"
#include "ingen/serialisation/Parser.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "flowcanvas/Port.hpp"
#include "App.hpp"
#include "Port.hpp"
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 06ae6491..1aca1adf 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -16,7 +16,7 @@
*/
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PortModel.hpp"
#include "ingen/client/PluginModel.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index 786e5b49..c239e7d8 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include "raul/log.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PluginModel.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PortModel.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index e4716451..1a96cc63 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -21,7 +21,7 @@
#include <boost/optional.hpp>
#include <glibmm/miscutils.h>
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/ClientStore.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 2e0c4290..c94fac30 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -23,7 +23,7 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/PatchModel.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "App.hpp"
#include "LoadPluginWindow.hpp"
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 51a8651a..a21c65f8 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -17,7 +17,7 @@
#include "App.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/ClientStore.hpp"
#include "NewSubpatchWindow.hpp"
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index d5a304df..97f81e69 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -17,7 +17,7 @@
#include <cmath>
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "App.hpp"
#include "NodeControlWindow.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 0432d888..af13e0cf 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -17,7 +17,7 @@
#include <gtkmm.h>
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PluginModel.hpp"
#include "App.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index d0e5c2cb..7ba26c9b 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
#include "raul/log.hpp"
#include "raul/Atom.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PluginModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index c46abf01..693dec73 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -21,7 +21,7 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/client/ObjectModel.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "App.hpp"
#include "ObjectMenu.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index c1194395..191713eb 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -23,7 +23,7 @@
#include "flowcanvas/Canvas.hpp"
#include "flowcanvas/Ellipse.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/shared/Builder.hpp"
#include "ingen/shared/ClashAvoider.hpp"
#include "ingen/serialisation/Serialiser.hpp"
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 19ac52e3..a65d39ac 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -19,7 +19,7 @@
#include <utility>
#include "PatchPortModule.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/NodeModel.hpp"
#include "App.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index fef646c1..0c75dd6a 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -18,7 +18,7 @@
#include "raul/log.hpp"
#include "raul/Path.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/PatchModel.hpp"
#include "App.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index f15d0667..5ba23b85 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -19,7 +19,7 @@
#include <fstream>
#include "raul/log.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "App.hpp"
#include "PatchView.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 14f7c060..05f5fcc9 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -27,7 +27,7 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/PatchModel.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "App.hpp"
#include "BreadCrumbs.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index adaf2510..25a1972b 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -19,7 +19,7 @@
#include "raul/log.hpp"
#include "flowcanvas/Module.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/PortModel.hpp"
#include "App.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 2da24ace..2c727d31 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -19,7 +19,7 @@
#include <gtkmm.h>
#include "raul/SharedPtr.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/PatchModel.hpp"
#include "ingen/client/PortModel.hpp"
#include "App.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 7ce9e064..ca962300 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include <string>
#include "ingen/ServerInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/NodeModel.hpp"
#include "ingen/client/PluginModel.hpp"
#include "App.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index daadf48e..e62eb101 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include <string>
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/ServerInterface.hpp"
#include "ingen/client/ObjectModel.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index e3085e95..777ea11f 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -21,7 +21,7 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/client/PatchModel.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "App.hpp"
#include "NodeControlWindow.hpp"
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index 7540badf..d8d204a7 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -22,7 +22,7 @@
#include <boost/optional/optional.hpp>
#include <curl/curl.h>
#include "ingen/shared/World.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/client/ClientStore.hpp"
#include "ingen/ServerInterface.hpp"
#include "ingen/serialisation/Serialiser.hpp"
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 98235bcd..85f3236b 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -36,7 +36,7 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/shared/World.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/serialisation/Parser.hpp"
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index c003d4f8..3d528af4 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -50,9 +50,9 @@
#include "ingen/Patch.hpp"
#include "ingen/Plugin.hpp"
#include "ingen/Port.hpp"
-#include "shared/LV2URIMap.hpp"
-#include "shared/ResourceImpl.hpp"
-#include "shared/Store.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/ResourceImpl.hpp"
+#include "ingen/shared/Store.hpp"
#include "ingen/shared/World.hpp"
#include "ingen/serialisation/Serialiser.hpp"
diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp
index 86b5e835..ba02fad7 100644
--- a/src/server/AudioBuffer.cpp
+++ b/src/server/AudioBuffer.cpp
@@ -18,12 +18,11 @@
#include <stdlib.h>
#include <assert.h>
+#include "ingen/shared/LV2Features.hpp"
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "raul/SharedPtr.hpp"
#include "raul/log.hpp"
-#include "shared/LV2Features.hpp"
-
#include "AudioBuffer.hpp"
#include "ProcessContext.hpp"
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index e2945d6f..d61653bf 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include "raul/log.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "AudioBuffer.hpp"
#include "EventBuffer.hpp"
#include "ObjectBuffer.hpp"
diff --git a/src/server/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 13ebff8f..5dfcc246 100644
--- a/src/server/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -19,7 +19,7 @@
#include <boost/intrusive_ptr.hpp>
#include "raul/log.hpp"
#include "raul/Maid.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "AudioBuffer.hpp"
#include "BufferFactory.hpp"
#include "ConnectionImpl.hpp"
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index da5bb6e4..797b3721 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -19,7 +19,7 @@
#include "raul/log.hpp"
#include "raul/midi_events.h"
#include "ingen/shared/URIs.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/shared/World.hpp"
#include "AudioBuffer.hpp"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index b1e69498..fc390ba3 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -22,7 +22,7 @@
#include <map>
#include "raul/SharedPtr.hpp"
#include "raul/Path.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "BufferFactory.hpp"
namespace Ingen {
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index e4b854a2..c2a2b505 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include <string>
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ConnectionImpl.hpp"
#include "DuplexPort.hpp"
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 3caa4b6f..a38e936f 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -27,9 +27,9 @@
#include "events/CreatePatch.hpp"
#include "events/CreatePort.hpp"
#include "ingen/shared/World.hpp"
-#include "shared/LV2Features.hpp"
-#include "shared/LV2URIMap.hpp"
-#include "shared/Store.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/Store.hpp"
#include "BufferFactory.hpp"
#include "ClientBroadcaster.hpp"
#include "ControlBindings.hpp"
diff --git a/src/server/EngineStore.hpp b/src/server/EngineStore.hpp
index 76a97b9c..7cf9f9e0 100644
--- a/src/server/EngineStore.hpp
+++ b/src/server/EngineStore.hpp
@@ -20,7 +20,7 @@
#include "raul/SharedPtr.hpp"
-#include "shared/Store.hpp"
+#include "ingen/shared/Store.hpp"
namespace Ingen {
diff --git a/src/server/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp
index a9abf26a..f31bd470 100644
--- a/src/server/GraphObjectImpl.hpp
+++ b/src/server/GraphObjectImpl.hpp
@@ -26,7 +26,7 @@
#include "raul/Path.hpp"
#include "raul/SharedPtr.hpp"
#include "ingen/GraphObject.hpp"
-#include "shared/ResourceImpl.hpp"
+#include "ingen/shared/ResourceImpl.hpp"
namespace Raul { class Maid; }
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 42a6e167..6a959ce9 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -31,7 +31,7 @@
#include "ProcessContext.hpp"
#include "ThreadManager.hpp"
#include "mix.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "util.hpp"
using namespace std;
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index 73dcf2f5..2be57051 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include <string>
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "internals/Controller.hpp"
#include "internals/Delay.hpp"
#include "internals/Note.hpp"
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index b6b21d15..11424475 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -48,8 +48,8 @@
#include "QueuedEvent.hpp"
#include "ThreadManager.hpp"
#include "ingen/shared/World.hpp"
-#include "shared/LV2Features.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "util.hpp"
#define LOG(s) s << "[JackDriver] "
diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp
index 05b5010d..6b94f72f 100644
--- a/src/server/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -25,7 +25,7 @@
#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
#include "ingen/shared/World.hpp"
-#include "shared/LV2Features.hpp"
+#include "ingen/shared/LV2Features.hpp"
#include "LV2Info.hpp"
#include "LV2RequestRunFeature.hpp"
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index fbb7e2ee..1dc64aaa 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -26,7 +26,7 @@
#include "raul/Maid.hpp"
#include "raul/Array.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "AudioBuffer.hpp"
#include "EventBuffer.hpp"
diff --git a/src/server/LV2Node.hpp b/src/server/LV2Node.hpp
index 06c79c20..d668072f 100644
--- a/src/server/LV2Node.hpp
+++ b/src/server/LV2Node.hpp
@@ -26,7 +26,7 @@
#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
#include "NodeImpl.hpp"
-#include "shared/LV2Features.hpp"
+#include "ingen/shared/LV2Features.hpp"
#include "types.hpp"
namespace Ingen {
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index a3dbe34d..59028cfc 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -23,7 +23,7 @@
#include "sord/sordmm.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
#include "LV2Node.hpp"
diff --git a/src/server/LV2RequestRunFeature.hpp b/src/server/LV2RequestRunFeature.hpp
index a10a0eee..a14c7df0 100644
--- a/src/server/LV2RequestRunFeature.hpp
+++ b/src/server/LV2RequestRunFeature.hpp
@@ -22,7 +22,7 @@
#include "raul/log.hpp"
-#include "shared/LV2Features.hpp"
+#include "ingen/shared/LV2Features.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index 095796a7..47a65dcc 100644
--- a/src/server/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -20,7 +20,7 @@
#include "raul/log.hpp"
#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
-#include "shared/LV2Features.hpp"
+#include "ingen/shared/LV2Features.hpp"
#include "NodeImpl.hpp"
#include "PortImpl.hpp"
diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp
index 7cc28cc7..a2e8350d 100644
--- a/src/server/Notification.cpp
+++ b/src/server/Notification.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ClientBroadcaster.hpp"
#include "Notification.hpp"
diff --git a/src/server/ObjectBuffer.cpp b/src/server/ObjectBuffer.cpp
index d09fbb96..ca3a442f 100644
--- a/src/server/ObjectBuffer.cpp
+++ b/src/server/ObjectBuffer.cpp
@@ -22,8 +22,8 @@
#include "raul/log.hpp"
#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
#include "ingen-config.h"
-#include "shared/LV2Features.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ObjectBuffer.hpp"
#include "Engine.hpp"
diff --git a/src/server/ObjectSender.cpp b/src/server/ObjectSender.cpp
index 16255135..8381a4db 100644
--- a/src/server/ObjectSender.cpp
+++ b/src/server/ObjectSender.cpp
@@ -17,7 +17,7 @@
#include "ObjectSender.hpp"
#include "ingen/ClientInterface.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "EngineStore.hpp"
#include "PatchImpl.hpp"
#include "NodeImpl.hpp"
diff --git a/src/server/OutputPort.cpp b/src/server/OutputPort.cpp
index 05700a22..e2d8cd9c 100644
--- a/src/server/OutputPort.cpp
+++ b/src/server/OutputPort.cpp
@@ -21,7 +21,7 @@
#include "NodeImpl.hpp"
#include "OutputPort.hpp"
#include "ProcessContext.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
using namespace std;
diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp
index cf50ee2a..7dd960c4 100644
--- a/src/server/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -31,7 +31,7 @@
#include "PortImpl.hpp"
#include "ProcessSlave.hpp"
#include "ThreadManager.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/shared/World.hpp"
using namespace std;
diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp
index ac551cef..cab77b05 100644
--- a/src/server/PluginImpl.hpp
+++ b/src/server/PluginImpl.hpp
@@ -25,7 +25,7 @@
#include <glibmm/module.h>
#include "ingen/Plugin.hpp"
-#include "shared/ResourceImpl.hpp"
+#include "ingen/shared/ResourceImpl.hpp"
namespace Ingen {
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 456634a0..a5f74f27 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -20,7 +20,7 @@
#include "raul/Array.hpp"
#include "raul/Maid.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ingen/shared/LV2Atom.hpp"
#include "AudioBuffer.hpp"
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index 7722caee..20134a0c 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -19,7 +19,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
#include "sord/sordmm.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "CreateNode.hpp"
#include "Request.hpp"
#include "PatchImpl.hpp"
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index 290ee626..d62a2203 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -17,7 +17,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "events/CreatePatch.hpp"
#include "Request.hpp"
#include "PatchImpl.hpp"
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 28e337e3..418cdab0 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -19,7 +19,7 @@
#include "raul/Atom.hpp"
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "ClientBroadcaster.hpp"
#include "ControlBindings.hpp"
#include "CreatePort.hpp"
diff --git a/src/server/events/RegisterClient.cpp b/src/server/events/RegisterClient.cpp
index 7b22bd17..869f2c0f 100644
--- a/src/server/events/RegisterClient.cpp
+++ b/src/server/events/RegisterClient.cpp
@@ -20,7 +20,7 @@
#include "Engine.hpp"
#include "Request.hpp"
#include "events/RegisterClient.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
using namespace Raul;
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 806d47ef..d49d2b50 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -38,7 +38,7 @@
#include "Request.hpp"
#include "SetMetadata.hpp"
#include "SetPortValue.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#define LOG(s) s << "[SetMetadata] "
diff --git a/src/server/events/SetMetadata.hpp b/src/server/events/SetMetadata.hpp
index bf359b79..92987db9 100644
--- a/src/server/events/SetMetadata.hpp
+++ b/src/server/events/SetMetadata.hpp
@@ -26,7 +26,7 @@
#include "ControlBindings.hpp"
#include "QueuedEvent.hpp"
-#include "shared/ResourceImpl.hpp"
+#include "ingen/shared/ResourceImpl.hpp"
namespace Ingen {
namespace Server {
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index a783e4e9..dc5d1564 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -18,8 +18,8 @@
#include <sstream>
#include "raul/log.hpp"
#include "lv2/lv2plug.in/ns/ext/event/event.h"
-#include "shared/LV2URIMap.hpp"
-#include "shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2Features.hpp"
#include "ingen/shared/LV2Atom.hpp"
#include "ingen/shared/World.hpp"
#include "AudioBuffer.hpp"
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 86a45f03..df9c6bfb 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -17,7 +17,7 @@
#include <math.h>
#include "raul/midi_events.h"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "internals/Controller.hpp"
#include "AudioBuffer.hpp"
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 5d597c53..a1b331ed 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -21,7 +21,7 @@
#include "raul/Array.hpp"
#include "raul/Maid.hpp"
#include "raul/midi_events.h"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "internals/Delay.hpp"
#include "AudioBuffer.hpp"
#include "Driver.hpp"
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 0b0acbdc..57ea0db9 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -20,7 +20,7 @@
#include "raul/Array.hpp"
#include "raul/Maid.hpp"
#include "raul/midi_events.h"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "internals/Note.hpp"
#include "AudioBuffer.hpp"
#include "Driver.hpp"
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 349bb1d9..13a75bbc 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -18,7 +18,7 @@
#include <cmath>
#include "raul/log.hpp"
#include "raul/midi_events.h"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "internals/Trigger.hpp"
#include "AudioBuffer.hpp"
#include "EventBuffer.hpp"
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 83c2eafc..fff40f3f 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -25,7 +25,7 @@
#include "ingen/Plugin.hpp"
#include "ingen/Port.hpp"
#include "ingen/shared/Builder.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
using namespace std;
using namespace Raul;
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index b9135951..9e8ea973 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -21,8 +21,7 @@
#include "raul/log.hpp"
#include "ingen/shared/ClashAvoider.hpp"
-
-#include "Store.hpp"
+#include "ingen/shared/Store.hpp"
using namespace std;
using namespace Raul;
diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp
index 3381b90b..25e169e0 100644
--- a/src/shared/LV2Atom.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -16,14 +16,13 @@
*/
#include "ingen/shared/LV2Atom.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
#include "raul/Atom.hpp"
#include "raul/log.hpp"
-#include "LV2Features.hpp"
-#include "LV2URIMap.hpp"
-
using namespace std;
using namespace Raul;
diff --git a/src/shared/LV2Features.cpp b/src/shared/LV2Features.cpp
index ea5cdd8a..753c0969 100644
--- a/src/shared/LV2Features.cpp
+++ b/src/shared/LV2Features.cpp
@@ -17,8 +17,8 @@
#include <cstdlib>
-#include "LV2Features.hpp"
-#include "LV2URIMap.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
using namespace std;
diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp
deleted file mode 100644
index f33cc605..00000000
--- a/src/shared/LV2Features.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-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_LV2FEATURES_HPP
-#define INGEN_SHARED_LV2FEATURES_HPP
-
-#include <vector>
-
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
-#include "raul/SharedPtr.hpp"
-
-namespace Ingen {
-
-class Node;
-
-namespace Shared {
-
-class World;
-
-/** Stuff that may need to be passed to an LV2 plugin (i.e. LV2 features).
- */
-class LV2Features {
-public:
- LV2Features();
-
- class Feature {
- public:
- virtual ~Feature() {}
-
- virtual SharedPtr<LV2_Feature> feature(Shared::World* world,
- Node* node) = 0;
- };
-
- class FeatureArray {
- public:
- typedef std::vector< SharedPtr<LV2_Feature> > FeatureVector;
-
- explicit FeatureArray(FeatureVector& features);
-
- ~FeatureArray();
-
- LV2_Feature** array() { return _array; }
-
- private:
- FeatureVector _features;
- LV2_Feature** _array;
- };
-
- void add_feature(SharedPtr<Feature> feature);
-
- SharedPtr<FeatureArray> lv2_features(Shared::World* world,
- Node* node) const;
-
-private:
- typedef std::vector< SharedPtr<Feature> > Features;
- Features _features;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_LV2FEATURES_HPP
diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index 78d22b70..f87fdfce 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -24,12 +24,10 @@
#include <boost/shared_ptr.hpp>
-#include "raul/log.hpp"
-
+#include "ingen/shared/LV2URIMap.hpp"
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "lv2/lv2plug.in/ns/ext/event/event.h"
-
-#include "LV2URIMap.hpp"
+#include "raul/log.hpp"
using namespace std;
using namespace Raul;
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
deleted file mode 100644
index 4fd50e92..00000000
--- a/src/shared/LV2URIMap.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-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_LV2URIMAP_HPP
-#define INGEN_SHARED_LV2URIMAP_HPP
-
-#include <map>
-#include <utility>
-
-#include <boost/utility.hpp>
-
-#include "ingen/shared/URIs.hpp"
-#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-#include "raul/URI.hpp"
-
-#include "LV2Features.hpp"
-
-namespace Ingen {
-namespace Shared {
-
-/** Implementation of the LV2 URI Map extension
- */
-class LV2URIMap : public boost::noncopyable, public LV2Features::Feature {
-public:
- LV2URIMap(URIs& uris);
-
- SharedPtr<LV2_Feature> feature(Shared::World*, Node*) {
- return SharedPtr<LV2_Feature>(&uri_map_feature, NullDeleter<LV2_Feature>);
- }
-
- virtual uint32_t uri_to_id(const char* map, const char* uri);
- virtual const char* id_to_uri(const char* map, uint32_t id);
-
- std::pair<bool, uint32_t> event_to_global(uint16_t event_id) const;
- std::pair<bool, uint16_t> global_to_event(uint32_t global_id) const;
-
-private:
- static uint32_t uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
- const char* map,
- const char* uri);
-
- LV2_Feature uri_map_feature;
- LV2_URI_Map_Feature uri_map_feature_data;
-
- typedef std::map<uint16_t, uint32_t> EventToGlobal;
- typedef std::map<uint32_t, uint16_t> GlobalToEvent;
-
- EventToGlobal _event_to_global;
- GlobalToEvent _global_to_event;
-
- URIs& _uris;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_LV2URIMAP_HPP
diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp
index 1f9662f3..6f4b713b 100644
--- a/src/shared/ResourceImpl.cpp
+++ b/src/shared/ResourceImpl.cpp
@@ -17,8 +17,8 @@
#include "raul/log.hpp"
#include "raul/Atom.hpp"
-#include "shared/LV2URIMap.hpp"
-#include "ResourceImpl.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/ResourceImpl.hpp"
using namespace std;
using namespace Raul;
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
deleted file mode 100644
index 13f1bd8f..00000000
--- a/src/shared/ResourceImpl.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-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_RESOURCEIMPL_HPP
-#define INGEN_SHARED_RESOURCEIMPL_HPP
-
-#include "raul/URI.hpp"
-#include "raul/SharedPtr.hpp"
-
-#include "ingen/Resource.hpp"
-
-namespace Ingen {
-namespace Shared {
-
-class URIs;
-
-class ResourceImpl : virtual public Resource
-{
-public:
- ResourceImpl(URIs& uris, const Raul::URI& uri)
- : _uris(uris)
- , _uri(uri)
- {}
-
- URIs& uris() const { return _uris; }
-
- virtual void set_uri(const Raul::URI& uri) { _uri = uri; }
- virtual const Raul::URI& uri() const { return _uri; }
-
- const Properties& properties() const { return _properties; }
- Properties& properties() { return _properties; }
-
- Properties properties(Resource::Graph ctx) const;
-
- const Raul::Atom& get_property(const Raul::URI& uri) const;
- const Raul::Atom& set_property(const Raul::URI& uri, const Raul::Atom& value,
- Resource::Graph ctx=Resource::DEFAULT);
- void remove_property(const Raul::URI& uri, const Raul::Atom& value);
- bool has_property(const Raul::URI& uri, const Raul::Atom& value) const;
- void add_property(const Raul::URI& uri, const Raul::Atom& value,
- Graph ctx=DEFAULT);
- void set_properties(const Properties& p);
- void add_properties(const Properties& p);
- void remove_properties(const Properties& p);
-
- void dump(std::ostream& os) const;
-
- /** Get the ingen type from a set of Properties.
- * If some coherent ingen type is found, true is returned and the appropriate
- * output parameter set to true. Otherwise false is returned.
- */
- static bool type(const URIs& uris,
- const Properties& properties,
- bool& patch,
- bool& node,
- bool& port,
- bool& is_output);
-
-protected:
- const Raul::Atom& set_property(const Raul::URI& uri, const Raul::Atom& value) const;
-
- URIs& _uris;
-
-private:
- Raul::URI _uri;
- mutable Properties _properties;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_RESOURCEIMPL_HPP
-
diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp
index 62c7f824..dd685c96 100644
--- a/src/shared/Store.cpp
+++ b/src/shared/Store.cpp
@@ -21,7 +21,7 @@
#include "raul/TableImpl.hpp"
#include "ingen/Node.hpp"
#include "ingen/Port.hpp"
-#include "Store.hpp"
+#include "ingen/shared/Store.hpp"
using namespace std;
using namespace Raul;
diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp
deleted file mode 100644
index cc78e946..00000000
--- a/src/shared/Store.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This file is part of Ingen.
- * Copyright 2008-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_STORE_HPP
-#define INGEN_SHARED_STORE_HPP
-
-#include <string>
-
-#include <glibmm/thread.h>
-
-#include "raul/PathTable.hpp"
-
-#include "ingen/GraphObject.hpp"
-
-namespace Ingen {
-namespace Shared {
-
-class Store : public Raul::PathTable< SharedPtr<GraphObject> > {
-public:
- virtual ~Store() {}
-
- virtual void add(GraphObject* o);
-
- typedef Raul::Table< Raul::Path, SharedPtr<GraphObject> > Objects;
-
- const_iterator children_begin(SharedPtr<const GraphObject> o) const;
- const_iterator children_end(SharedPtr<const GraphObject> o) const;
-
- SharedPtr<GraphObject> find_child(SharedPtr<const GraphObject> parent,
- const std::string& child_name) const;
-
- unsigned child_name_offset(const Raul::Path& parent,
- const Raul::Symbol& symbol,
- bool allow_zero=true);
-
- Glib::RWLock& lock() { return _lock; }
-
-private:
- Glib::RWLock _lock;
-};
-
-} // namespace Shared
-} // namespace Ingen
-
-#endif // INGEN_SHARED_STORE_HPP
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index 4f6b279b..9aa17d4f 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -29,8 +29,8 @@
#include "ingen/shared/Module.hpp"
#include "ingen/shared/World.hpp"
#include "ingen/shared/runtime_paths.hpp"
-#include "shared/LV2Features.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/shared/LV2Features.hpp"
+#include "ingen/shared/LV2URIMap.hpp"
#define LOG(s) s << "[Module] "