From 84762e0bfbc76d45e3e5bcbd42a49bb63c539dd7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 14 Apr 2019 22:45:08 +0200
Subject: Use modern LV2 includes

---
 src/instance.c      |  2 +-
 src/lib.c           |  2 +-
 src/lilv_internal.h |  2 +-
 src/plugin.c        |  6 +++---
 src/port.c          |  6 +++---
 src/state.c         | 12 ++++++------
 src/world.c         |  6 +++---
 7 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/instance.c b/src/instance.c
index 23d6cae..ac263c7 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -16,8 +16,8 @@
 
 #include "lilv_internal.h"
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "lilv/lilv.h"
+#include "lv2/core/lv2.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/lib.c b/src/lib.c
index 68eff47..06510cb 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -17,7 +17,7 @@
 #include "lilv_internal.h"
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 #include "zix/tree.h"
 
 #include <stdint.h>
diff --git a/src/lilv_internal.h b/src/lilv_internal.h
index da38d05..52e0870 100644
--- a/src/lilv_internal.h
+++ b/src/lilv_internal.h
@@ -60,7 +60,7 @@ static inline const char* dlerror(void) { return "Unknown error"; }
 #endif
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #endif
 
 /*
diff --git a/src/plugin.c b/src/plugin.c
index effe854..b2648dd 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -24,11 +24,11 @@
 #include "sord/sord.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/ui/ui.h"
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #    include <dlfcn.h>
 #endif
 
diff --git a/src/port.c b/src/port.c
index ce11e3f..bdcb176 100644
--- a/src/port.c
+++ b/src/port.c
@@ -16,9 +16,9 @@
 
 #include "lilv_internal.h"
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
+#include "lv2/event/event.h"
 
 #include "lilv/lilv.h"
 #include "sord/sord.h"
diff --git a/src/state.c b/src/state.c
index 3841c75..f2b88e7 100644
--- a/src/state.c
+++ b/src/state.c
@@ -22,12 +22,12 @@
 #include "sratom/sratom.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/core/lv2.h"
+#include "lv2/presets/presets.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/world.c b/src/world.c
index 29c16d0..0bf7cf3 100644
--- a/src/world.c
+++ b/src/world.c
@@ -23,11 +23,11 @@
 #include "zix/common.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/presets/presets.h"
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #    include <dlfcn.h>
 #endif
 
-- 
cgit v1.2.1