From 4e796ccba8df5d24824d2abc1d18eb6628ba839a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 6 Oct 2010 07:41:37 +0000 Subject: Use URI-based LV2 header includes. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2626 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginUI.cpp | 5 +++-- src/common/atom.lv2 | 1 - src/common/contexts.lv2 | 1 - src/common/event.lv2 | 1 - src/common/resize-port.lv2 | 1 - src/common/string-port.lv2 | 1 - src/common/uri-map.lv2 | 1 - src/engine/AudioBuffer.cpp | 2 +- src/engine/ConnectionImpl.hpp | 3 +-- 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 | 2 +- 28 files changed, 28 insertions(+), 34 deletions(-) delete mode 120000 src/common/atom.lv2 delete mode 120000 src/common/contexts.lv2 delete mode 120000 src/common/event.lv2 delete mode 120000 src/common/resize-port.lv2 delete mode 120000 src/common/string-port.lv2 delete mode 120000 src/common/uri-map.lv2 (limited to 'src') diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index 74d87a13..e0c7463b 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -16,8 +16,9 @@ */ #include "raul/log.hpp" -#include "event.lv2/event-helpers.h" -#include "atom.lv2/atom.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/common/atom.lv2 b/src/common/atom.lv2 deleted file mode 120000 index fd3ebc0e..00000000 --- a/src/common/atom.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/atom.lv2 \ No newline at end of file diff --git a/src/common/contexts.lv2 b/src/common/contexts.lv2 deleted file mode 120000 index 2893b17b..00000000 --- a/src/common/contexts.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/contexts.lv2 \ No newline at end of file diff --git a/src/common/event.lv2 b/src/common/event.lv2 deleted file mode 120000 index 223f3b04..00000000 --- a/src/common/event.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/event.lv2/ \ No newline at end of file diff --git a/src/common/resize-port.lv2 b/src/common/resize-port.lv2 deleted file mode 120000 index e43b9525..00000000 --- a/src/common/resize-port.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/resize-port.lv2 \ No newline at end of file diff --git a/src/common/string-port.lv2 b/src/common/string-port.lv2 deleted file mode 120000 index 03e5a56a..00000000 --- a/src/common/string-port.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/string-port.lv2 \ No newline at end of file diff --git a/src/common/uri-map.lv2 b/src/common/uri-map.lv2 deleted file mode 120000 index 922af68f..00000000 --- a/src/common/uri-map.lv2 +++ /dev/null @@ -1 +0,0 @@ -../../../lv2/ext/uri-map.lv2/ \ No newline at end of file diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp index 65b8040e..4baf5020 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 "atom.lv2/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 ddaae17a..e08d0ec4 100644 --- a/src/engine/ConnectionImpl.hpp +++ b/src/engine/ConnectionImpl.hpp @@ -25,8 +25,7 @@ #include "raul/IntrusivePtr.hpp" #include "interface/PortType.hpp" #include "interface/Connection.hpp" -#include "atom.lv2/atom.h" -#include "PortImpl.hpp" +#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 140d2e1d..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 "uri-map.lv2/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 c7ae3f80..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 "event.lv2/event.h" -#include "event.lv2/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 3245fcd3..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 "event.lv2/event.h" -#include "event.lv2/event-helpers.h" -#include "atom.lv2/atom.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 6ad7655b..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 "event.lv2/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 d0af81b3..0737ed92 100644 --- a/src/engine/LV2Info.cpp +++ b/src/engine/LV2Info.cpp @@ -18,7 +18,7 @@ #define __STDC_LIMIT_MACROS 1 #include #include -#include "atom.lv2/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 004098ed..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 "contexts.lv2/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 b5b207d1..15a86225 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 "resize-port.lv2/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 26ebccb5..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 "contexts.lv2/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 8b7074ea..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 "atom.lv2/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 f554f46e..e2bb1139 100644 --- a/src/engine/NodeImpl.cpp +++ b/src/engine/NodeImpl.cpp @@ -17,7 +17,7 @@ #include #include -#include "contexts.lv2/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 7afd7be7..3c644a4d 100644 --- a/src/engine/ObjectBuffer.cpp +++ b/src/engine/ObjectBuffer.cpp @@ -20,7 +20,7 @@ #include #include #include "raul/log.hpp" -#include "uri-map.lv2/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 28d54a82..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 "atom.lv2/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 41b36c2d..fed22507 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 "contexts.lv2/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 c07762bd..c793845e 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -17,7 +17,7 @@ #include #include "raul/log.hpp" -#include "event.lv2/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 d53388b5..c0385387 100644 --- a/src/engine/ingen_lv2.cpp +++ b/src/engine/ingen_lv2.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "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 8b6ca0a5..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 "uri-map.lv2/uri-map.h" -#include "atom.lv2/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 1582adb5..20b17628 100644 --- a/src/shared/LV2Features.hpp +++ b/src/shared/LV2Features.hpp @@ -21,7 +21,7 @@ #include #include #include -#include "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 9f52a61d..e07c5218 100644 --- a/src/shared/LV2URIMap.cpp +++ b/src/shared/LV2URIMap.cpp @@ -21,7 +21,7 @@ #include #include #include "raul/log.hpp" -#include "atom.lv2/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 70cdd1b0..e9514e40 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -20,7 +20,7 @@ #include #include -#include "uri-map.lv2/uri-map.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" #include "ingen-config.h" #include "LV2Features.hpp" -- cgit v1.2.1