From 3500ef73d4f668897df248a11bd631e11180045c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 21 Oct 2011 19:54:57 +0000 Subject: Move more headers to shared include directory. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3566 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/AudioBuffer.cpp | 3 +-- src/server/BufferFactory.cpp | 2 +- src/server/ConnectionImpl.cpp | 2 +- src/server/ControlBindings.cpp | 2 +- src/server/ControlBindings.hpp | 2 +- src/server/DuplexPort.cpp | 2 +- src/server/Engine.cpp | 6 +++--- src/server/EngineStore.hpp | 2 +- src/server/GraphObjectImpl.hpp | 2 +- src/server/InputPort.cpp | 2 +- src/server/InternalPlugin.cpp | 2 +- src/server/JackDriver.cpp | 4 ++-- src/server/LV2Info.cpp | 2 +- src/server/LV2Node.cpp | 2 +- src/server/LV2Node.hpp | 2 +- src/server/LV2Plugin.cpp | 2 +- src/server/LV2RequestRunFeature.hpp | 2 +- src/server/LV2ResizeFeature.hpp | 2 +- src/server/Notification.cpp | 2 +- src/server/ObjectBuffer.cpp | 4 ++-- src/server/ObjectSender.cpp | 2 +- src/server/OutputPort.cpp | 2 +- src/server/PatchImpl.cpp | 2 +- src/server/PluginImpl.hpp | 2 +- src/server/PortImpl.cpp | 2 +- src/server/events/CreateNode.cpp | 2 +- src/server/events/CreatePatch.cpp | 2 +- src/server/events/CreatePort.cpp | 2 +- src/server/events/RegisterClient.cpp | 2 +- src/server/events/SetMetadata.cpp | 2 +- src/server/events/SetMetadata.hpp | 2 +- src/server/events/SetPortValue.cpp | 4 ++-- src/server/internals/Controller.cpp | 2 +- src/server/internals/Delay.cpp | 2 +- src/server/internals/Note.cpp | 2 +- src/server/internals/Trigger.cpp | 2 +- 36 files changed, 41 insertions(+), 42 deletions(-) (limited to 'src/server') 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 #include +#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 #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 #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 #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 #include -#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 #include -#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 #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 #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 #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 #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" -- cgit v1.2.1