Update clang-format configuration

16 files changed, 55 insertions, 79 deletions

diff --git a/.clang-format b/.clang-format
index 8ee2675..c40ad9c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,37 +1,38 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
+# Copyright 2020-2024 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR ISC
 
 ---
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
-AlignEscapedNewlinesLeft: true
+AlignEscapedNewlines: Left
+AttributeMacros:
+  - LV2_DEPRECATED
+  - LV2_SYMBOL_EXPORT
 BasedOnStyle: Mozilla
 BraceWrapping:
-  AfterNamespace: false
   AfterClass: true
   AfterEnum: false
   AfterExternBlock: false
   AfterFunction: true
+  AfterNamespace: false
   AfterStruct: false
   SplitEmptyFunction: false
   SplitEmptyRecord: false
 BreakBeforeBraces: Custom
 Cpp11BracedListStyle: true
+ForEachMacros:
+  - LV2_ATOM_OBJECT_BODY_FOREACH
+  - LV2_ATOM_OBJECT_FOREACH
+  - LV2_ATOM_SEQUENCE_BODY_FOREACH
+  - LV2_ATOM_SEQUENCE_FOREACH
+  - LV2_ATOM_TUPLE_BODY_FOREACH
+  - LV2_ATOM_TUPLE_FOREACH
 IndentCaseLabels: false
 IndentPPDirectives: AfterHash
 KeepEmptyLinesAtTheStartOfBlocks: false
 SpacesInContainerLiterals: false
 StatementMacros:
-  - LV2_DEPRECATED
   - LV2_DISABLE_DEPRECATION_WARNINGS
   - LV2_RESTORE_WARNINGS
-  - LV2_SYMBOL_EXPORT
   - _Pragma
-ForEachMacros:
-  - LV2_ATOM_OBJECT_BODY_FOREACH
-  - LV2_ATOM_OBJECT_FOREACH
-  - LV2_ATOM_SEQUENCE_BODY_FOREACH
-  - LV2_ATOM_SEQUENCE_FOREACH
-  - LV2_ATOM_TUPLE_BODY_FOREACH
-  - LV2_ATOM_TUPLE_FOREACH
 ...
diff --git a/include/lv2/atom/forge.h b/include/lv2/atom/forge.h
index f894a5a..be9e842 100644
--- a/include/lv2/atom/forge.h
+++ b/include/lv2/atom/forge.h
@@ -90,24 +90,24 @@ typedef struct {
 
   LV2_Atom_Forge_Frame* stack;
 
-  LV2_URID Blank    LV2_DEPRECATED;
-  LV2_URID          Bool;
-  LV2_URID          Chunk;
-  LV2_URID          Double;
-  LV2_URID          Float;
-  LV2_URID          Int;
-  LV2_URID          Long;
-  LV2_URID          Literal;
-  LV2_URID          Object;
-  LV2_URID          Path;
-  LV2_URID          Property;
+  LV2_URID Blank LV2_DEPRECATED;
+  LV2_URID Bool;
+  LV2_URID Chunk;
+  LV2_URID Double;
+  LV2_URID Float;
+  LV2_URID Int;
+  LV2_URID Long;
+  LV2_URID Literal;
+  LV2_URID Object;
+  LV2_URID Path;
+  LV2_URID Property;
   LV2_URID Resource LV2_DEPRECATED;
-  LV2_URID          Sequence;
-  LV2_URID          String;
-  LV2_URID          Tuple;
-  LV2_URID          URI;
-  LV2_URID          URID;
-  LV2_URID          Vector;
+  LV2_URID Sequence;
+  LV2_URID String;
+  LV2_URID Tuple;
+  LV2_URID URI;
+  LV2_URID URID;
+  LV2_URID Vector;
 } LV2_Atom_Forge;
 
 static inline void
@@ -569,8 +569,7 @@ lv2_atom_forge_object(LV2_Atom_Forge*       forge,
    This function is deprecated and should not be used in new code.
    Use lv2_atom_forge_object() directly instead.
 */
-LV2_DEPRECATED
-static inline LV2_Atom_Forge_Ref
+LV2_DEPRECATED static inline LV2_Atom_Forge_Ref
 lv2_atom_forge_resource(LV2_Atom_Forge*       forge,
                         LV2_Atom_Forge_Frame* frame,
                         LV2_URID              id,
@@ -588,8 +587,7 @@ lv2_atom_forge_resource(LV2_Atom_Forge*       forge,
    This function is deprecated and should not be used in new code.
    Use lv2_atom_forge_object() directly instead.
 */
-LV2_DEPRECATED
-static inline LV2_Atom_Forge_Ref
+LV2_DEPRECATED static inline LV2_Atom_Forge_Ref
 lv2_atom_forge_blank(LV2_Atom_Forge*       forge,
                      LV2_Atom_Forge_Frame* frame,
                      uint32_t              id,
diff --git a/include/lv2/core/lv2.h b/include/lv2/core/lv2.h
index c70a4c2..6fbb1ec 100644
--- a/include/lv2/core/lv2.h
+++ b/include/lv2/core/lv2.h
@@ -384,8 +384,7 @@ typedef struct LV2_Descriptor {
    Note that `index` has no meaning, hosts MUST NOT depend on it remaining
    consistent between loads of the plugin library.
 */
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index);
 
 /**
@@ -450,8 +449,7 @@ typedef struct {
    be destroyed (using LV2_Lib_Descriptor::cleanup()) until all plugins loaded
    from that library have been destroyed.
 */
-LV2_SYMBOL_EXPORT
-const LV2_Lib_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Lib_Descriptor*
 lv2_lib_descriptor(const char* bundle_path, const LV2_Feature* const* features);
 
 /**
diff --git a/include/lv2/dynmanifest/dynmanifest.h b/include/lv2/dynmanifest/dynmanifest.h
index b1a273c..1c50e27 100644
--- a/include/lv2/dynmanifest/dynmanifest.h
+++ b/include/lv2/dynmanifest/dynmanifest.h
@@ -56,8 +56,7 @@ typedef void* LV2_Dyn_Manifest_Handle;
    evaluate the result of the operation by examining the returned value and
    MUST NOT try to interpret the value of handle.
 */
-LV2_SYMBOL_EXPORT
-int
+LV2_SYMBOL_EXPORT int
 lv2_dyn_manifest_open(LV2_Dyn_Manifest_Handle*  handle,
                       const LV2_Feature* const* features);
 
@@ -84,8 +83,7 @@ lv2_dyn_manifest_open(LV2_Dyn_Manifest_Handle*  handle,
 
    @return 0 on success, otherwise a non-zero error code.
 */
-LV2_SYMBOL_EXPORT
-int
+LV2_SYMBOL_EXPORT int
 lv2_dyn_manifest_get_subjects(LV2_Dyn_Manifest_Handle handle, FILE* fp);
 
 /**
@@ -118,8 +116,7 @@ lv2_dyn_manifest_get_subjects(LV2_Dyn_Manifest_Handle handle, FILE* fp);
 
    @return 0 on success, otherwise a non-zero error code.
 */
-LV2_SYMBOL_EXPORT
-int
+LV2_SYMBOL_EXPORT int
 lv2_dyn_manifest_get_data(LV2_Dyn_Manifest_Handle handle,
                           FILE*                   fp,
                           const char*             uri);
@@ -135,8 +132,7 @@ lv2_dyn_manifest_get_data(LV2_Dyn_Manifest_Handle handle,
 
    @param handle Dynamic manifest generator handle.
 */
-LV2_SYMBOL_EXPORT
-void
+LV2_SYMBOL_EXPORT void
 lv2_dyn_manifest_close(LV2_Dyn_Manifest_Handle handle);
 
 #ifdef __cplusplus
diff --git a/include/lv2/event/event.h b/include/lv2/event/event.h
index e255291..dc15f45 100644
--- a/include/lv2/event/event.h
+++ b/include/lv2/event/event.h
@@ -51,8 +51,7 @@ LV2_DISABLE_DEPRECATION_WARNINGS
    Equal to 2^12 * 5 * 7 * 9 * 11 * 13 * 17, which is evenly divisible
    by all integers from 1 through 18 inclusive, and powers of 2 up to 2^12.
 */
-LV2_DEPRECATED
-static const uint32_t LV2_EVENT_PPQN = 3136573440U;
+LV2_DEPRECATED static const uint32_t LV2_EVENT_PPQN = 3136573440U;
 
 /**
    An LV2 event (header only).
@@ -67,8 +66,7 @@ static const uint32_t LV2_EVENT_PPQN = 3136573440U;
 
    memcpy(ev_copy, ev, sizeof(LV2_Event) + ev->size);  (or equivalent)
 */
-LV2_DEPRECATED
-typedef struct {
+LV2_DEPRECATED typedef struct {
   /**
      The frames portion of timestamp. The units used here can optionally be
      set for a port (with the lv2ev:timeUnits property), otherwise this is
@@ -127,8 +125,7 @@ typedef struct {
    | | | | | | | | | | | | | | | | | | | | | | | | |
    |FRAMES |SUBFRMS|TYP|LEN|DATA..DATA..PAD|FRAMES | ...
 */
-LV2_DEPRECATED
-typedef struct {
+LV2_DEPRECATED typedef struct {
   /**
      The contents of the event buffer. This may or may not reside in the
      same block of memory as this header, plugins must not assume either.
@@ -210,8 +207,7 @@ typedef struct {
 /**
    Opaque pointer to host data.
 */
-LV2_DEPRECATED
-typedef void* LV2_Event_Callback_Data;
+LV2_DEPRECATED typedef void* LV2_Event_Callback_Data;
 
 /**
    Non-POD events feature.
@@ -221,8 +217,7 @@ typedef void* LV2_Event_Callback_Data;
    and data pointed to an instance of this struct.  Note this feature
    is not mandatory to support the event extension.
 */
-LV2_DEPRECATED
-typedef struct {
+LV2_DEPRECATED typedef struct {
   /**
      Opaque pointer to host data.
 
diff --git a/include/lv2/ui/ui.h b/include/lv2/ui/ui.h
index d17edcb..af7a723 100644
--- a/include/lv2/ui/ui.h
+++ b/include/lv2/ui/ui.h
@@ -511,8 +511,7 @@ typedef struct {
    This is the entry point to a UI library, which works in the same way as
    lv2_descriptor() but for UIs rather than plugins.
 */
-LV2_SYMBOL_EXPORT
-const LV2UI_Descriptor*
+LV2_SYMBOL_EXPORT const LV2UI_Descriptor*
 lv2ui_descriptor(uint32_t index);
 
 /**
diff --git a/include/lv2/uri-map/uri-map.h b/include/lv2/uri-map/uri-map.h
index dc25a55..1e7a327 100644
--- a/include/lv2/uri-map/uri-map.h
+++ b/include/lv2/uri-map/uri-map.h
@@ -43,8 +43,7 @@ LV2_DISABLE_DEPRECATION_WARNINGS
 /**
    Opaque pointer to host data.
 */
-LV2_DEPRECATED
-typedef void* LV2_URI_Map_Callback_Data;
+LV2_DEPRECATED typedef void* LV2_URI_Map_Callback_Data;
 
 /**
    URI Map Feature.
@@ -53,8 +52,7 @@ typedef void* LV2_URI_Map_Callback_Data;
    plugin's instantiate method with URI "http://lv2plug.in/ns/ext/uri-map"
    and data pointed to an instance of this struct.
 */
-LV2_DEPRECATED
-typedef struct {
+LV2_DEPRECATED typedef struct {
   /**
      Opaque pointer to host data.
 
diff --git a/plugins/eg-amp.lv2/amp.c b/plugins/eg-amp.lv2/amp.c
index 9c22049..8983769 100644
--- a/plugins/eg-amp.lv2/amp.c
+++ b/plugins/eg-amp.lv2/amp.c
@@ -196,8 +196,7 @@ static const LV2_Descriptor descriptor = {AMP_URI,
    This method is in the ``discovery'' threading class, so no other functions
    or methods in this plugin library will be called concurrently with it.
 */
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-fifths.lv2/fifths.c b/plugins/eg-fifths.lv2/fifths.c
index d2400b4..b34c4d5 100644
--- a/plugins/eg-fifths.lv2/fifths.c
+++ b/plugins/eg-fifths.lv2/fifths.c
@@ -160,8 +160,7 @@ static const LV2_Descriptor descriptor = {EG_FIFTHS_URI,
                                           cleanup,
                                           extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-metro.lv2/metro.c b/plugins/eg-metro.lv2/metro.c
index f3fe164..c06829f 100644
--- a/plugins/eg-metro.lv2/metro.c
+++ b/plugins/eg-metro.lv2/metro.c
@@ -331,8 +331,7 @@ static const LV2_Descriptor descriptor = {
   NULL, // extension_data
 };
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-midigate.lv2/midigate.c b/plugins/eg-midigate.lv2/midigate.c
index db2fdea..112c0cd 100644
--- a/plugins/eg-midigate.lv2/midigate.c
+++ b/plugins/eg-midigate.lv2/midigate.c
@@ -213,8 +213,7 @@ static const LV2_Descriptor descriptor = {MIDIGATE_URI,
                                           cleanup,
                                           extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-params.lv2/params.c b/plugins/eg-params.lv2/params.c
index 742c48b..159704b 100644
--- a/plugins/eg-params.lv2/params.c
+++ b/plugins/eg-params.lv2/params.c
@@ -512,8 +512,7 @@ static const LV2_Descriptor descriptor = {EG_PARAMS_URI,
                                           cleanup,
                                           extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return (index == 0) ? &descriptor : NULL;
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index 4c5a92a..d20f10d 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -688,8 +688,7 @@ static const LV2_Descriptor descriptor = {EG_SAMPLER_URI,
                                           cleanup,
                                           extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index fc879eb..555255d 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -451,8 +451,7 @@ static const LV2UI_Descriptor descriptor = {SAMPLER_UI_URI,
                                             port_event,
                                             extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2UI_Descriptor*
+LV2_SYMBOL_EXPORT const LV2UI_Descriptor*
 lv2ui_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;
diff --git a/plugins/eg-scope.lv2/examploscope.c b/plugins/eg-scope.lv2/examploscope.c
index 918fca2..f4d276d 100644
--- a/plugins/eg-scope.lv2/examploscope.c
+++ b/plugins/eg-scope.lv2/examploscope.c
@@ -398,8 +398,7 @@ static const LV2_Descriptor descriptor_stereo = {SCO_URI "#Stereo",
                                                  cleanup,
                                                  extension_data};
 
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor*
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
 lv2_descriptor(uint32_t index)
 {
   switch (index) {
diff --git a/plugins/eg-scope.lv2/examploscope_ui.c b/plugins/eg-scope.lv2/examploscope_ui.c
index 7b49967..896226b 100644
--- a/plugins/eg-scope.lv2/examploscope_ui.c
+++ b/plugins/eg-scope.lv2/examploscope_ui.c
@@ -655,8 +655,7 @@ static const LV2UI_Descriptor descriptor = {SCO_URI "#ui",
                                             port_event,
                                             NULL};
 
-LV2_SYMBOL_EXPORT
-const LV2UI_Descriptor*
+LV2_SYMBOL_EXPORT const LV2UI_Descriptor*
 lv2ui_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;