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

11 files changed, 10 insertions, 10 deletions

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 <boost/utility.hpp>
 
 #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
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 <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#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
index 701fecb534..701fecb534 100644
--- a/libs/ardour/lv2ext/lv2_event.h
+++ b/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
index f996e2ed16..f996e2ed16 100644
--- a/libs/ardour/lv2ext/lv2_files.h
+++ b/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
index 6879a865ba..6879a865ba 100644
--- a/libs/ardour/lv2ext/lv2_persist.h
+++ b/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
index 4066a2f468..4066a2f468 100644
--- a/libs/ardour/lv2ext/lv2_uri_map.h
+++ b/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
index d6cb90039a..d6cb90039a 100644
--- a/libs/ardour/lv2ext/lv2_uri_unmap.h
+++ b/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 <stdint.h>
 #include <iostream>
-#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 <lilv/lilv.h>
 
-#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 <suil/suil.h>