From 3f2be7b6f9c5bb21afbbb0deadda0f40f8a64e26 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Nov 2024 09:45:27 -0500 Subject: Use angle brackets for library includes --- src/comm.c | 4 +++- src/comm.h | 8 ++++---- src/control.c | 8 ++++---- src/control.h | 6 +++--- src/dumper.c | 14 +++++++------- src/dumper.h | 4 ++-- src/frontend.h | 2 +- src/jack.c | 10 +++++----- src/jalv.c | 42 +++++++++++++++++++++--------------------- src/jalv_console.c | 10 +++++----- src/jalv_gtk.c | 20 ++++++++++---------- src/jalv_internal.h | 27 +++++++++++++-------------- src/jalv_qt.cpp | 6 +++--- src/jalv_qt.hpp | 2 +- src/log.c | 4 ++-- src/log.h | 4 ++-- src/lv2_evbuf.c | 4 ++-- src/main.c | 4 ++-- src/mapper.c | 4 ++-- src/mapper.h | 4 ++-- src/nodes.c | 22 +++++++++++----------- src/nodes.h | 2 +- src/port.h | 2 +- src/portaudio.c | 4 ++-- src/process.c | 10 +++++----- src/query.c | 5 +++-- src/query.h | 2 +- src/state.c | 16 ++++++++-------- src/state.h | 4 ++-- src/symap.h | 2 +- src/urids.c | 16 ++++++++-------- src/urids.h | 2 +- src/worker.c | 12 ++++++------ src/worker.h | 8 ++++---- 34 files changed, 148 insertions(+), 146 deletions(-) (limited to 'src') diff --git a/src/comm.c b/src/comm.c index c7ed49b..b3bdfd1 100644 --- a/src/comm.c +++ b/src/comm.c @@ -3,7 +3,9 @@ #include "comm.h" -#include "lv2/urid/urid.h" +#include +#include +#include ZixStatus jalv_write_split_message(ZixRing* const target, diff --git a/src/comm.h b/src/comm.h index 642a534..eb6b615 100644 --- a/src/comm.h +++ b/src/comm.h @@ -7,10 +7,10 @@ #include "attributes.h" #include "types.h" -#include "lv2/atom/atom.h" -#include "lv2/urid/urid.h" -#include "zix/ring.h" -#include "zix/status.h" +#include +#include +#include +#include #include diff --git a/src/control.c b/src/control.c index 19cf3e9..ed4affa 100644 --- a/src/control.c +++ b/src/control.c @@ -6,10 +6,10 @@ #include "log.h" #include "string_utils.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/urid/urid.h" +#include +#include +#include +#include #include #include diff --git a/src/control.h b/src/control.h index 102fdad..661eb21 100644 --- a/src/control.h +++ b/src/control.h @@ -7,9 +7,9 @@ #include "attributes.h" #include "nodes.h" -#include "lilv/lilv.h" -#include "lv2/atom/forge.h" -#include "lv2/urid/urid.h" +#include +#include +#include #include #include diff --git a/src/dumper.c b/src/dumper.c index 64f66e9..06722d8 100644 --- a/src/dumper.c +++ b/src/dumper.c @@ -5,13 +5,13 @@ #include "log.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/patch/patch.h" -#include "lv2/time/time.h" -#include "lv2/urid/urid.h" -#include "serd/serd.h" -#include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/dumper.h b/src/dumper.h index 9b0cec9..60dcfe1 100644 --- a/src/dumper.h +++ b/src/dumper.h @@ -6,8 +6,8 @@ #include "attributes.h" -#include "lv2/atom/atom.h" -#include "lv2/urid/urid.h" +#include +#include #include diff --git a/src/frontend.h b/src/frontend.h index f95e64b..c798ea8 100644 --- a/src/frontend.h +++ b/src/frontend.h @@ -8,7 +8,7 @@ #include "options.h" #include "types.h" -#include "lilv/lilv.h" +#include #include diff --git a/src/jack.c b/src/jack.c index 242b5e5..3a0ca2a 100644 --- a/src/jack.c +++ b/src/jack.c @@ -15,11 +15,11 @@ #include "types.h" #include "urids.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/urid/urid.h" -#include "zix/sem.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/jalv.c b/src/jalv.c index 3400f89..1127586 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -21,29 +21,29 @@ #include "urids.h" #include "worker.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "lv2/buf-size/buf-size.h" -#include "lv2/core/lv2.h" -#include "lv2/data-access/data-access.h" -#include "lv2/instance-access/instance-access.h" -#include "lv2/log/log.h" -#include "lv2/options/options.h" -#include "lv2/patch/patch.h" -#include "lv2/state/state.h" -#include "lv2/ui/ui.h" -#include "lv2/urid/urid.h" -#include "lv2/worker/worker.h" -#include "zix/allocator.h" -#include "zix/filesystem.h" -#include "zix/ring.h" -#include "zix/sem.h" -#include "zix/status.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if USE_SUIL -# include "suil/suil.h" +# include #endif #include diff --git a/src/jalv_console.c b/src/jalv_console.c index 855e3b8..7219c87 100644 --- a/src/jalv_console.c +++ b/src/jalv_console.c @@ -12,13 +12,13 @@ #include "string_utils.h" #include "types.h" -#include "lilv/lilv.h" -#include "lv2/ui/ui.h" -#include "zix/attributes.h" -#include "zix/sem.h" +#include +#include +#include +#include #if USE_SUIL -# include "suil/suil.h" +# include #endif #ifdef _WIN32 diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c index 97d078b..c9672dd 100644 --- a/src/jalv_gtk.c +++ b/src/jalv_gtk.c @@ -10,16 +10,16 @@ #include "state.h" #include "types.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/ui/ui.h" -#include "lv2/urid/urid.h" -#include "suil/suil.h" -#include "zix/attributes.h" -#include "zix/sem.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/jalv_internal.h b/src/jalv_internal.h index 88ea7ab..592d9c8 100644 --- a/src/jalv_internal.h +++ b/src/jalv_internal.h @@ -17,23 +17,22 @@ #include "urids.h" #include "worker.h" -#include "zix/ring.h" -#include "zix/sem.h" - -#include "lilv/lilv.h" #if USE_SUIL -# include "suil/suil.h" +# include #endif -#include "lv2/atom/forge.h" -#include "lv2/core/lv2.h" -#include "lv2/data-access/data-access.h" -#include "lv2/log/log.h" -#include "lv2/options/options.h" -#include "lv2/state/state.h" -#include "lv2/ui/ui.h" -#include "lv2/urid/urid.h" -#include "lv2/worker/worker.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp index 7761f10..8b62f72 100644 --- a/src/jalv_qt.cpp +++ b/src/jalv_qt.cpp @@ -9,9 +9,9 @@ #include "port.h" #include "query.h" -#include "lilv/lilv.h" -#include "suil/suil.h" -#include "zix/sem.h" +#include +#include +#include #include #include diff --git a/src/jalv_qt.hpp b/src/jalv_qt.hpp index 19bf408..40f9af7 100644 --- a/src/jalv_qt.hpp +++ b/src/jalv_qt.hpp @@ -5,7 +5,7 @@ #include "state.h" #include "types.h" -#include "lilv/lilv.h" +#include #include #include diff --git a/src/log.c b/src/log.c index 9d07fd7..c267ade 100644 --- a/src/log.c +++ b/src/log.c @@ -5,8 +5,8 @@ #include "jalv_config.h" -#include "lv2/log/log.h" -#include "lv2/urid/urid.h" +#include +#include #if USE_ISATTY # include diff --git a/src/log.h b/src/log.h index f92a68a..3d4d033 100644 --- a/src/log.h +++ b/src/log.h @@ -7,8 +7,8 @@ #include "attributes.h" #include "urids.h" -#include "lv2/log/log.h" -#include "lv2/urid/urid.h" +#include +#include #include #include diff --git a/src/lv2_evbuf.c b/src/lv2_evbuf.c index 355cac2..054e2a1 100644 --- a/src/lv2_evbuf.c +++ b/src/lv2_evbuf.c @@ -4,8 +4,8 @@ #include "lv2_evbuf.h" #include "jalv_config.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" +#include +#include #include #include diff --git a/src/main.c b/src/main.c index 51a5d3d..32950bd 100644 --- a/src/main.c +++ b/src/main.c @@ -7,8 +7,8 @@ #include "jalv_internal.h" #include "types.h" -#include "zix/attributes.h" -#include "zix/sem.h" +#include +#include #if USE_SUIL #endif diff --git a/src/mapper.c b/src/mapper.c index 7afccab..3e5c2af 100644 --- a/src/mapper.c +++ b/src/mapper.c @@ -5,8 +5,8 @@ #include "symap.h" -#include "lv2/urid/urid.h" -#include "zix/sem.h" +#include +#include #include #include diff --git a/src/mapper.h b/src/mapper.h index d9cdf3e..4d541f6 100644 --- a/src/mapper.h +++ b/src/mapper.h @@ -6,8 +6,8 @@ #include "attributes.h" -#include "lv2/urid/urid.h" -#include "zix/attributes.h" +#include +#include // URI to URID mapping and unmapping JALV_BEGIN_DECLS diff --git a/src/nodes.c b/src/nodes.c index 32ffa71..d448657 100644 --- a/src/nodes.c +++ b/src/nodes.c @@ -3,17 +3,17 @@ #include "nodes.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" -#include "lv2/midi/midi.h" -#include "lv2/port-groups/port-groups.h" -#include "lv2/port-props/port-props.h" -#include "lv2/presets/presets.h" -#include "lv2/resize-port/resize-port.h" -#include "lv2/state/state.h" -#include "lv2/ui/ui.h" -#include "lv2/worker/worker.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/nodes.h b/src/nodes.h index 60ffe36..8e93426 100644 --- a/src/nodes.h +++ b/src/nodes.h @@ -6,7 +6,7 @@ #include "attributes.h" -#include "lilv/lilv.h" +#include // Cached lilv nodes JALV_BEGIN_DECLS diff --git a/src/port.h b/src/port.h index e860a27..df6e1f4 100644 --- a/src/port.h +++ b/src/port.h @@ -8,7 +8,7 @@ #include "lv2_evbuf.h" #include "types.h" -#include "lilv/lilv.h" +#include #include #include diff --git a/src/portaudio.c b/src/portaudio.c index 44dba2e..e6f7f70 100644 --- a/src/portaudio.c +++ b/src/portaudio.c @@ -10,8 +10,8 @@ #include "process.h" #include "types.h" -#include "lilv/lilv.h" -#include "zix/attributes.h" +#include +#include #include #include diff --git a/src/process.c b/src/process.c index d183238..de6685d 100644 --- a/src/process.c +++ b/src/process.c @@ -10,11 +10,11 @@ #include "port.h" #include "worker.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" -#include "zix/ring.h" -#include "zix/sem.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/query.c b/src/query.c index f3b9724..c0c19d2 100644 --- a/src/query.c +++ b/src/query.c @@ -3,8 +3,9 @@ #include "query.h" -#include "lv2/core/lv2.h" -#include "lv2/ui/ui.h" +#include +#include +#include bool jalv_port_has_designation(const JalvNodes* const nodes, diff --git a/src/query.h b/src/query.h index e39d12e..4a452c6 100644 --- a/src/query.h +++ b/src/query.h @@ -7,7 +7,7 @@ #include "attributes.h" #include "nodes.h" -#include "lilv/lilv.h" +#include #include diff --git a/src/state.c b/src/state.c index 0f83c2d..d894f9c 100644 --- a/src/state.c +++ b/src/state.c @@ -10,14 +10,14 @@ #include "port.h" #include "string_utils.h" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "lv2/state/state.h" -#include "lv2/urid/urid.h" -#include "zix/attributes.h" -#include "zix/ring.h" -#include "zix/sem.h" -#include "zix/status.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/state.h b/src/state.h index a2a1922..c4c1fd3 100644 --- a/src/state.h +++ b/src/state.h @@ -7,8 +7,8 @@ #include "attributes.h" #include "types.h" -#include "lilv/lilv.h" -#include "lv2/state/state.h" +#include +#include // State and preset utilities JALV_BEGIN_DECLS diff --git a/src/symap.h b/src/symap.h index 276b41e..66a1514 100644 --- a/src/symap.h +++ b/src/symap.h @@ -12,7 +12,7 @@ #ifndef SYMAP_H #define SYMAP_H -#include "zix/attributes.h" +#include #include diff --git a/src/urids.c b/src/urids.c index 3d2da1c..ff74635 100644 --- a/src/urids.c +++ b/src/urids.c @@ -5,14 +5,14 @@ #include "mapper.h" -#include "lv2/atom/atom.h" -#include "lv2/buf-size/buf-size.h" -#include "lv2/log/log.h" -#include "lv2/midi/midi.h" -#include "lv2/parameters/parameters.h" -#include "lv2/patch/patch.h" -#include "lv2/time/time.h" -#include "lv2/ui/ui.h" +#include +#include +#include +#include +#include +#include +#include +#include void jalv_init_urids(JalvMapper* const mapper, JalvURIDs* const urids) diff --git a/src/urids.h b/src/urids.h index 50e6060..7ac1a45 100644 --- a/src/urids.h +++ b/src/urids.h @@ -7,7 +7,7 @@ #include "attributes.h" #include "mapper.h" -#include "lv2/urid/urid.h" +#include // Cached LV2 URIDs JALV_BEGIN_DECLS diff --git a/src/worker.c b/src/worker.c index 4592a40..f9d4060 100644 --- a/src/worker.c +++ b/src/worker.c @@ -3,12 +3,12 @@ #include "worker.h" -#include "lv2/core/lv2.h" -#include "lv2/worker/worker.h" -#include "zix/ring.h" -#include "zix/sem.h" -#include "zix/status.h" -#include "zix/thread.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/worker.h b/src/worker.h index b95fcc2..0e39894 100644 --- a/src/worker.h +++ b/src/worker.h @@ -6,10 +6,10 @@ #include "attributes.h" -#include "lv2/core/lv2.h" -#include "lv2/worker/worker.h" -#include "zix/sem.h" -#include "zix/status.h" +#include +#include +#include +#include #include #include -- cgit v1.2.1