aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.clang-format12
-rw-r--r--src/jalv_gtk.c3
-rw-r--r--src/symap.h9
3 files changed, 14 insertions, 10 deletions
diff --git a/.clang-format b/.clang-format
index a2d270e..6332390 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,10 @@
---
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
-AlignEscapedNewlinesLeft: true
+AlignEscapedNewlines: Left
+AttributeMacros:
+ - ZIX_MALLOC_FUNC
+ - ZIX_PURE_FUNC
BasedOnStyle: Mozilla
BraceWrapping:
AfterNamespace: false
@@ -17,7 +20,12 @@ Cpp11BracedListStyle: true
FixNamespaceComments: true
ForEachMacros:
- LILV_FOREACH
- - foreach
+ - 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
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index 002bcb4..9784420 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -820,8 +820,7 @@ jalv_ui_port_event(Jalv* jalv,
} else if (obj->body.otype == jalv->urids.patch_Put) {
const LV2_Atom_Object* body = NULL;
if (!patch_put_get(jalv, obj, &body)) {
- LV2_ATOM_OBJECT_FOREACH(body, prop)
- {
+ LV2_ATOM_OBJECT_FOREACH (body, prop) {
property_changed(jalv, prop->key, &prop->value);
}
}
diff --git a/src/symap.h b/src/symap.h
index 74dc59a..276b41e 100644
--- a/src/symap.h
+++ b/src/symap.h
@@ -19,8 +19,7 @@
typedef struct SymapImpl Symap;
/// Create a new symbol map
-ZIX_MALLOC_FUNC
-Symap*
+ZIX_MALLOC_FUNC Symap*
symap_new(void);
/// Free a symbol map
@@ -28,8 +27,7 @@ void
symap_free(Symap* map);
/// Map a string to a symbol if it is already mapped, otherwise return 0
-ZIX_PURE_FUNC
-uint32_t
+ZIX_PURE_FUNC uint32_t
symap_try_map(const Symap* map, const char* sym);
/// Map a string to a symbol
@@ -37,8 +35,7 @@ uint32_t
symap_map(Symap* map, const char* sym);
/// Unmap a symbol back to a string if possible, otherwise return NULL
-ZIX_PURE_FUNC
-const char*
+ZIX_PURE_FUNC const char*
symap_unmap(const Symap* map, uint32_t id);
#endif // SYMAP_H