From 0caf3e7f786e3fd232d926c2794293fa0dc975c5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 7 Nov 2011 18:30:40 +0000 Subject: [PATCH] Use standard style LV2 extension include paths. This has a few benefits: * As system installed extensions become more ubiquitous, we can optionally build against those rather than including them in the source tree, without any source changes * No need to hack extension headers to change the include paths to match our specific scheme (i.e. headers are precisely those from the extension, even if they include other extension headers) * Consistency, lack of ambiguity, easy code sharing, blah blah, etc. git-svn-id: svn://localhost/ardour2/branches/3.0@10476 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/lv2_event_buffer.h | 4 ++-- libs/ardour/ardour/lv2_state.h | 2 +- libs/ardour/ardour/uri_map.h | 4 ++-- .../lv2plug.in/ns/ext/event/event-helpers.h} | 2 +- .../lv2_event.h => lv2/lv2plug.in/ns/ext/event/event.h} | 0 .../lv2_files.h => lv2/lv2plug.in/ns/ext/files/files.h} | 0 .../lv2_persist.h => lv2/lv2plug.in/ns/ext/persist/persist.h} | 0 .../lv2_uri_map.h => lv2/lv2plug.in/ns/ext/uri-map/uri-map.h} | 0 .../lv2plug.in/ns/ext/uri-unmap/uri-unmap.h} | 0 libs/ardour/lv2_event_buffer.cc | 4 ++-- libs/ardour/lv2_plugin_lilv.cc | 4 ++-- 11 files changed, 10 insertions(+), 10 deletions(-) rename libs/ardour/{lv2ext/lv2_event_helpers.h => lv2/lv2plug.in/ns/ext/event/event-helpers.h} (99%) rename libs/ardour/{lv2ext/lv2_event.h => lv2/lv2plug.in/ns/ext/event/event.h} (100%) rename libs/ardour/{lv2ext/lv2_files.h => lv2/lv2plug.in/ns/ext/files/files.h} (100%) rename libs/ardour/{lv2ext/lv2_persist.h => lv2/lv2plug.in/ns/ext/persist/persist.h} (100%) rename libs/ardour/{lv2ext/lv2_uri_map.h => lv2/lv2plug.in/ns/ext/uri-map/uri-map.h} (100%) rename libs/ardour/{lv2ext/lv2_uri_unmap.h => lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h} (100%) diff --git a/libs/ardour/ardour/lv2_event_buffer.h b/libs/ardour/ardour/lv2_event_buffer.h index 6bdd02eee5..089681a730 100644 --- a/libs/ardour/ardour/lv2_event_buffer.h +++ b/libs/ardour/ardour/lv2_event_buffer.h @@ -20,8 +20,8 @@ #ifndef __ardour_lv2_event_buffer_h__ #define __ardour_lv2_event_buffer_h__ -#include "lv2ext/lv2_event.h" -#include "lv2ext/lv2_event_helpers.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/lv2_state.h b/libs/ardour/ardour/lv2_state.h index c8e2d01f02..5311efd049 100644 --- a/libs/ardour/ardour/lv2_state.h +++ b/libs/ardour/ardour/lv2_state.h @@ -29,7 +29,7 @@ #include "pbd/error.h" #include "ardour/uri_map.h" -#include "lv2ext/lv2_persist.h" +#include "lv2/lv2plug.in/ns/ext/persist/persist.h" #include "rdff.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/uri_map.h b/libs/ardour/ardour/uri_map.h index d75836e619..f24d03f18c 100644 --- a/libs/ardour/ardour/uri_map.h +++ b/libs/ardour/ardour/uri_map.h @@ -27,8 +27,8 @@ #include #include "lv2.h" -#include "lv2ext/lv2_uri_map.h" -#include "lv2ext/lv2_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" namespace ARDOUR { diff --git a/libs/ardour/lv2ext/lv2_event_helpers.h b/libs/ardour/lv2/lv2plug.in/ns/ext/event/event-helpers.h similarity index 99% rename from libs/ardour/lv2ext/lv2_event_helpers.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/event/event-helpers.h index de7d07e0f8..79f8a35fe8 100644 --- a/libs/ardour/lv2ext/lv2_event_helpers.h +++ b/libs/ardour/lv2/lv2plug.in/ns/ext/event/event-helpers.h @@ -25,7 +25,7 @@ #include #include #include -#include "lv2_event.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" /** @file * This header defines some helper functions for the the LV2 events extension diff --git a/libs/ardour/lv2ext/lv2_event.h b/libs/ardour/lv2/lv2plug.in/ns/ext/event/event.h similarity index 100% rename from libs/ardour/lv2ext/lv2_event.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/event/event.h diff --git a/libs/ardour/lv2ext/lv2_files.h b/libs/ardour/lv2/lv2plug.in/ns/ext/files/files.h similarity index 100% rename from libs/ardour/lv2ext/lv2_files.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/files/files.h diff --git a/libs/ardour/lv2ext/lv2_persist.h b/libs/ardour/lv2/lv2plug.in/ns/ext/persist/persist.h similarity index 100% rename from libs/ardour/lv2ext/lv2_persist.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/persist/persist.h diff --git a/libs/ardour/lv2ext/lv2_uri_map.h b/libs/ardour/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h similarity index 100% rename from libs/ardour/lv2ext/lv2_uri_map.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h diff --git a/libs/ardour/lv2ext/lv2_uri_unmap.h b/libs/ardour/lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h similarity index 100% rename from libs/ardour/lv2ext/lv2_uri_unmap.h rename to libs/ardour/lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h diff --git a/libs/ardour/lv2_event_buffer.cc b/libs/ardour/lv2_event_buffer.cc index dd666203fd..f1e5e4d0d1 100644 --- a/libs/ardour/lv2_event_buffer.cc +++ b/libs/ardour/lv2_event_buffer.cc @@ -19,8 +19,8 @@ #include #include -#include "lv2ext/lv2_event.h" -#include "lv2ext/lv2_event_helpers.h" +#include "lv2/lv2plug.in/ns/ext/event/event.h" +#include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" #include "ardour/lv2_event_buffer.h" using namespace std; diff --git a/libs/ardour/lv2_plugin_lilv.cc b/libs/ardour/lv2_plugin_lilv.cc index 25020e541a..e4c14383f6 100644 --- a/libs/ardour/lv2_plugin_lilv.cc +++ b/libs/ardour/lv2_plugin_lilv.cc @@ -51,8 +51,8 @@ #include -#include "lv2ext/lv2_files.h" -#include "lv2ext/lv2_persist.h" +#include "lv2/lv2plug.in/ns/ext/files/files.h" +#include "lv2/lv2plug.in/ns/ext/persist/persist.h" #include "rdff.h" #ifdef HAVE_SUIL #include