From 3a4efdc47d45558aef921eacae25d51f1b399528 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Apr 2019 20:25:45 +0200 Subject: Use modern LV2 includes --- src/jalv.c | 28 ++++++++++++++-------------- src/jalv_console.c | 2 +- src/jalv_gtk.c | 4 ++-- src/jalv_internal.h | 20 ++++++++++---------- src/jalv_qt.cpp | 4 ++-- src/lv2_evbuf.c | 2 +- src/worker.h | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/jalv.c b/src/jalv.c index e07e67a..562e23a 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -40,20 +40,20 @@ #include "jalv_config.h" #include "jalv_internal.h" -#include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h" -#include "lv2/lv2plug.in/ns/ext/data-access/data-access.h" -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h" -#include "lv2/lv2plug.in/ns/ext/patch/patch.h" -#include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h" -#include "lv2/lv2plug.in/ns/ext/port-props/port-props.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/time/time.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" +#include "lv2/atom/atom.h" +#include "lv2/buf-size/buf-size.h" +#include "lv2/data-access/data-access.h" +#include "lv2/options/options.h" +#include "lv2/parameters/parameters.h" +#include "lv2/patch/patch.h" +#include "lv2/port-groups/port-groups.h" +#include "lv2/port-props/port-props.h" +#include "lv2/presets/presets.h" +#include "lv2/state/state.h" +#include "lv2/time/time.h" +#include "lv2/ui/ui.h" +#include "lv2/urid/urid.h" +#include "lv2/worker/worker.h" #include "lilv/lilv.h" diff --git a/src/jalv_console.c b/src/jalv_console.c index 2a9e9b1..5c3ffe4 100644 --- a/src/jalv_console.c +++ b/src/jalv_console.c @@ -27,7 +27,7 @@ #include "jalv_config.h" #include "jalv_internal.h" -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" +#include "lv2/ui/ui.h" static int print_usage(const char* name, bool error) diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c index a27a8df..4fbdc3f 100644 --- a/src/jalv_gtk.c +++ b/src/jalv_gtk.c @@ -18,8 +18,8 @@ #include -#include "lv2/lv2plug.in/ns/ext/patch/patch.h" -#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h" +#include "lv2/patch/patch.h" +#include "lv2/port-props/port-props.h" #include "jalv_internal.h" diff --git a/src/jalv_internal.h b/src/jalv_internal.h index d607613..fb387d2 100644 --- a/src/jalv_internal.h +++ b/src/jalv_internal.h @@ -30,16 +30,16 @@ #include "suil/suil.h" #endif -#include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "lv2/lv2plug.in/ns/ext/atom/forge.h" -#include "lv2/lv2plug.in/ns/ext/data-access/data-access.h" -#include "lv2/lv2plug.in/ns/ext/log/log.h" -#include "lv2/lv2plug.in/ns/ext/midi/midi.h" -#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" -#include "lv2/lv2plug.in/ns/ext/state/state.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" -#include "lv2/lv2plug.in/ns/ext/options/options.h" +#include "lv2/atom/atom.h" +#include "lv2/atom/forge.h" +#include "lv2/data-access/data-access.h" +#include "lv2/log/log.h" +#include "lv2/midi/midi.h" +#include "lv2/options/options.h" +#include "lv2/resize-port/resize-port.h" +#include "lv2/state/state.h" +#include "lv2/urid/urid.h" +#include "lv2/worker/worker.h" #include "zix/ring.h" #include "zix/sem.h" diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp index e9d2121..267167e 100644 --- a/src/jalv_qt.cpp +++ b/src/jalv_qt.cpp @@ -20,8 +20,8 @@ #include "jalv_internal.h" -#include "lv2/lv2plug.in/ns/ext/patch/patch.h" -#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h" +#include "lv2/patch/patch.h" +#include "lv2/port-props/port-props.h" #include diff --git a/src/lv2_evbuf.c b/src/lv2_evbuf.c index d7012c7..bd17f49 100644 --- a/src/lv2_evbuf.c +++ b/src/lv2_evbuf.c @@ -18,7 +18,7 @@ #include #include -#include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/atom/atom.h" #include "lv2_evbuf.h" diff --git a/src/worker.h b/src/worker.h index a437fe7..0da6776 100644 --- a/src/worker.h +++ b/src/worker.h @@ -14,7 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "lv2/lv2plug.in/ns/ext/worker/worker.h" +#include "lv2/worker/worker.h" #include "jalv_internal.h" -- cgit v1.2.1