From d2f94aa4fd3472ff86fea5abe7a58d15a90d3264 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 26 Nov 2010 21:37:10 +0000 Subject: Update for latest LV2 #include style. Enable building against system installed LV2 extensions. Fix building slv2 and ingen independently. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2675 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginUI.cpp | 6 +++--- src/engine/AudioBuffer.cpp | 2 +- src/engine/ConnectionImpl.hpp | 2 +- src/engine/Engine.cpp | 2 +- src/engine/EventBuffer.cpp | 4 ++-- src/engine/EventBuffer.hpp | 6 +++--- src/engine/LV2EventFeature.hpp | 2 +- src/engine/LV2Info.cpp | 2 +- src/engine/LV2Node.hpp | 2 +- src/engine/LV2ResizeFeature.hpp | 2 +- src/engine/MessageContext.cpp | 2 +- src/engine/MessageContext.hpp | 2 +- src/engine/NodeImpl.cpp | 2 +- src/engine/ObjectBuffer.cpp | 2 +- src/engine/ObjectBuffer.hpp | 2 +- src/engine/PortImpl.cpp | 2 +- src/engine/events/SetPortValue.cpp | 2 +- src/engine/ingen_lv2.cpp | 2 +- src/shared/LV2Atom.cpp | 4 ++-- src/shared/LV2Features.hpp | 2 +- src/shared/LV2URIMap.cpp | 2 +- src/shared/LV2URIMap.hpp | 4 ++-- 22 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index 8d3f50d7..e0c7463b 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -16,9 +16,9 @@ */ #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" -#include "lv2/http/lv2plug.in/ns/ext/event/event.h" -#include "lv2/http/lv2plug.in/ns/ext/event/event-helpers.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" #include "shared/LV2Features.hpp" #include "shared/LV2URIMap.hpp" #include "shared/LV2Atom.hpp" diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp index 33394254..17cfeca9 100644 --- a/src/engine/AudioBuffer.cpp +++ b/src/engine/AudioBuffer.cpp @@ -19,7 +19,7 @@ #include #include "raul/log.hpp" #include "raul/SharedPtr.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "ingen-config.h" #include "AudioBuffer.hpp" #include "ProcessContext.hpp" diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp index 226a696e..e08d0ec4 100644 --- a/src/engine/ConnectionImpl.hpp +++ b/src/engine/ConnectionImpl.hpp @@ -25,7 +25,7 @@ #include "raul/IntrusivePtr.hpp" #include "interface/PortType.hpp" #include "interface/Connection.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "PortImpl.hpp" using namespace std; diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 66b84de4..a1d81a10 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -22,7 +22,7 @@ #include "raul/Deletable.hpp" #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" -#include "lv2/http/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" #include "common/interface/EventType.hpp" #include "events/CreatePatch.hpp" #include "events/CreatePort.hpp" diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp index ea4bc130..7dc6b179 100644 --- a/src/engine/EventBuffer.cpp +++ b/src/engine/EventBuffer.cpp @@ -18,8 +18,8 @@ #define __STDC_LIMIT_MACROS 1 #include #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/event/event.h" -#include "lv2/http/lv2plug.in/ns/ext/event/event-helpers.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" #include "ingen-config.h" #include "EventBuffer.hpp" #include "ProcessContext.hpp" diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp index 3f433b68..567abcab 100644 --- a/src/engine/EventBuffer.hpp +++ b/src/engine/EventBuffer.hpp @@ -18,9 +18,9 @@ #ifndef INGEN_ENGINE_EVENTBUFFER_HPP #define INGEN_ENGINE_EVENTBUFFER_HPP -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" -#include "lv2/http/lv2plug.in/ns/ext/event/event.h" -#include "lv2/http/lv2plug.in/ns/ext/event/event-helpers.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" #include "interface/PortType.hpp" #include "Buffer.hpp" diff --git a/src/engine/LV2EventFeature.hpp b/src/engine/LV2EventFeature.hpp index d38b609a..f58ecfbb 100644 --- a/src/engine/LV2EventFeature.hpp +++ b/src/engine/LV2EventFeature.hpp @@ -18,7 +18,7 @@ #ifndef INGEN_ENGINE_LV2EVENTFEATURE_HPP #define INGEN_ENGINE_LV2EVENTFEATURE_HPP -#include "lv2/http/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" #include "shared/LV2Features.hpp" namespace Ingen { diff --git a/src/engine/LV2Info.cpp b/src/engine/LV2Info.cpp index fcd303ef..f736dffb 100644 --- a/src/engine/LV2Info.cpp +++ b/src/engine/LV2Info.cpp @@ -18,7 +18,7 @@ #define __STDC_LIMIT_MACROS 1 #include #include -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "LV2Info.hpp" #include "module/World.hpp" #include "LV2Features.hpp" diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp index 3fed1185..74f3a922 100644 --- a/src/engine/LV2Node.hpp +++ b/src/engine/LV2Node.hpp @@ -21,7 +21,7 @@ #include #include "slv2/slv2.h" #include "raul/IntrusivePtr.hpp" -#include "lv2/http/lv2plug.in/ns/ext/contexts/contexts.h" +#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "types.hpp" #include "NodeImpl.hpp" #include "LV2Features.hpp" diff --git a/src/engine/LV2ResizeFeature.hpp b/src/engine/LV2ResizeFeature.hpp index b9097833..46ca74ec 100644 --- a/src/engine/LV2ResizeFeature.hpp +++ b/src/engine/LV2ResizeFeature.hpp @@ -19,7 +19,7 @@ #define INGEN_ENGINE_LV2RESIZEFEATURE_HPP #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/resize-port/resize-port.h" +#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" #include "shared/LV2Features.hpp" #include "NodeImpl.hpp" #include "PortImpl.hpp" diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp index 6858aab5..7fe92801 100644 --- a/src/engine/MessageContext.cpp +++ b/src/engine/MessageContext.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lv2/http/lv2plug.in/ns/ext/contexts/contexts.h" +#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "raul/log.hpp" #include "raul/Atom.hpp" #include "ConnectionImpl.hpp" diff --git a/src/engine/MessageContext.hpp b/src/engine/MessageContext.hpp index 486223bb..23ddf14c 100644 --- a/src/engine/MessageContext.hpp +++ b/src/engine/MessageContext.hpp @@ -23,7 +23,7 @@ #include "raul/Thread.hpp" #include "raul/Semaphore.hpp" #include "raul/AtomicPtr.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "Context.hpp" #include "ProcessContext.hpp" #include "ThreadManager.hpp" diff --git a/src/engine/NodeImpl.cpp b/src/engine/NodeImpl.cpp index 5fb0bac1..e2bb1139 100644 --- a/src/engine/NodeImpl.cpp +++ b/src/engine/NodeImpl.cpp @@ -17,7 +17,7 @@ #include #include -#include "lv2/http/lv2plug.in/ns/ext/contexts/contexts.h" +#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "raul/List.hpp" #include "raul/Array.hpp" #include "util.hpp" diff --git a/src/engine/ObjectBuffer.cpp b/src/engine/ObjectBuffer.cpp index 9ae153f5..4e1f459a 100644 --- a/src/engine/ObjectBuffer.cpp +++ b/src/engine/ObjectBuffer.cpp @@ -20,7 +20,7 @@ #include #include #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" #include "ingen-config.h" #include "shared/LV2Features.hpp" #include "shared/LV2URIMap.hpp" diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp index 96e318a0..09e150cb 100644 --- a/src/engine/ObjectBuffer.hpp +++ b/src/engine/ObjectBuffer.hpp @@ -19,7 +19,7 @@ #define INGEN_ENGINE_OBJECTBUFFER_HPP #include "raul/Atom.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "interface/PortType.hpp" #include "Buffer.hpp" diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index 67699bd7..29ac4b31 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -18,7 +18,7 @@ #include "raul/Array.hpp" #include "raul/Maid.hpp" #include "shared/LV2URIMap.hpp" -#include "lv2/http/lv2plug.in/ns/ext/contexts/contexts.h" +#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "interface/PortType.hpp" #include "events/SendPortValue.hpp" #include "events/SendPortActivity.hpp" diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp index 48695865..c793845e 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -17,7 +17,7 @@ #include #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" #include "shared/LV2URIMap.hpp" #include "shared/LV2Features.hpp" #include "shared/LV2Atom.hpp" diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp index 1fd71ff8..c0385387 100644 --- a/src/engine/ingen_lv2.cpp +++ b/src/engine/ingen_lv2.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "lv2/http/lv2plug.in/ns/lv2core/lv2.h" +#include "lv2/lv2plug.in/ns/lv2core/lv2.h" #include "ingen-config.h" #include "raul/log.hpp" #include "raul/Thread.hpp" diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp index fd1f9d4a..ea6a4fa2 100644 --- a/src/shared/LV2Atom.cpp +++ b/src/shared/LV2Atom.cpp @@ -17,8 +17,8 @@ #include "raul/log.hpp" #include "raul/Atom.hpp" -#include "lv2/http/lv2plug.in/ns/ext/uri-map/uri-map.h" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "LV2Features.hpp" #include "LV2Atom.hpp" #include "LV2URIMap.hpp" diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp index da17fb09..20b17628 100644 --- a/src/shared/LV2Features.hpp +++ b/src/shared/LV2Features.hpp @@ -21,7 +21,7 @@ #include #include #include -#include "lv2/http/lv2plug.in/ns/lv2core/lv2.h" +#include "lv2/lv2plug.in/ns/lv2core/lv2.h" #include "raul/SharedPtr.hpp" #include "ingen-config.h" diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp index d1e72844..34721db6 100644 --- a/src/shared/LV2URIMap.cpp +++ b/src/shared/LV2URIMap.cpp @@ -21,7 +21,7 @@ #include #include #include "raul/log.hpp" -#include "lv2/http/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "LV2URIMap.hpp" using namespace std; diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp index 15ef4283..13a97129 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -20,8 +20,8 @@ #include #include "raul/URI.hpp" -#include "lv2/http/lv2plug.in/ns/ext/uri-map/uri-map.h" -#include "lv2/http/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h" #include "ingen-config.h" #include "LV2Features.hpp" -- cgit v1.2.1