noop: fix formatting and clang errors

inc/actions/arranger_selections.h

@@ -403,8 +403,7 @@ arranger_selections_action_init_loaded (
  *
  * @param create 1 to create 0 to delete.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_create_or_delete (
   ArrangerSelections * sel,
   const bool           create,
@@ -418,8 +417,7 @@ arranger_selections_action_new_create_or_delete (
   arranger_selections_action_new_create_or_delete ( \
     (ArrangerSelections *) sel, false, error)
 
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_record (
   ArrangerSelections * sel_before,
   ArrangerSelections * sel_after,
@@ -437,8 +435,7 @@ arranger_selections_action_new_record (
  *   normalized amount, such as automation point
  *   normalized value.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_move_or_duplicate (
   ArrangerSelections *   sel,
   const bool             move,
@@ -518,8 +515,7 @@ arranger_selections_action_new_move_or_duplicate (
  * @param sel_before Original selections.
  * @param sel_after Selections after duplication.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_link (
   ArrangerSelections * sel_before,
   ArrangerSelections * sel_after,
@@ -539,8 +535,7 @@ arranger_selections_action_new_link (
  *   change.
  * @param type Indication of which field has changed.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_edit (
   ArrangerSelections *             sel_before,
   ArrangerSelections *             sel_after,
@@ -548,8 +543,7 @@ arranger_selections_action_new_edit (
   bool                             already_edited,
   GError **                        error);
 
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_edit_single_obj (
   const ArrangerObject *           obj_before,
   const ArrangerObject *           obj_after,
@@ -562,8 +556,7 @@ arranger_selections_action_new_edit_single_obj (
  * arranger_selections_action_new_edit() for MIDI
  * functions.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_edit_midi_function (
   ArrangerSelections * sel_before,
   MidiFunctionType     midi_func_type,
@@ -574,8 +567,7 @@ arranger_selections_action_new_edit_midi_function (
  * arranger_selections_action_new_edit() for
  * automation functions.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_edit_automation_function (
   ArrangerSelections *   sel_before,
   AutomationFunctionType automation_func_type,
@@ -586,8 +578,7 @@ arranger_selections_action_new_edit_automation_function (
  * arranger_selections_action_new_edit() for
  * automation functions.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_edit_audio_function (
   ArrangerSelections * sel_before,
   AudioFunctionType    audio_func_type,
@@ -604,8 +595,7 @@ arranger_selections_action_new_edit_audio_function (
  * @param already_changed Whether the change was
  *   already made.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_automation_fill (
   ZRegion * region_before,
   ZRegion * region_after,
@@ -618,8 +608,7 @@ arranger_selections_action_new_automation_fill (
  *
  * @param pos Global position to split at.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_split (
   ArrangerSelections * sel,
   const Position *     pos,
@@ -629,8 +618,7 @@ arranger_selections_action_new_split (
  * Creates a new action for merging
  * ArrangerObject's.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_merge (
   ArrangerSelections * sel,
   GError **            error);
@@ -642,8 +630,7 @@ arranger_selections_action_new_merge (
  * @param ticks How many ticks to add to the resizing
  *   edge.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_resize (
   ArrangerSelections *               sel,
   ArrangerSelectionsActionResizeType type,
@@ -657,15 +644,13 @@ arranger_selections_action_new_resize (
  *
  * @param opts Quantize options.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 arranger_selections_action_new_quantize (
   ArrangerSelections * sel,
   QuantizeOptions *    opts,
   GError **            error);
 
-NONNULL
-ArrangerSelectionsAction *
+NONNULL ArrangerSelectionsAction *
 arranger_selections_action_clone (
   const ArrangerSelectionsAction * src);
 

inc/actions/channel_send_action.h

@@ -106,8 +106,7 @@ channel_send_action_init_loaded (ChannelSendAction * self);
  * @param port_connections_mgr Port connections
  *   manager at the start of the action, if needed.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 channel_send_action_new (
   ChannelSend *                  send,
   ChannelSendActionType          type,
@@ -146,8 +145,7 @@ channel_send_action_new (
     send, CHANNEL_SEND_ACTION_CHANGE_AMOUNT, NULL, NULL, \
     amt, NULL, error)
 
-NONNULL
-ChannelSendAction *
+NONNULL ChannelSendAction *
 channel_send_action_clone (const ChannelSendAction * src);
 
 /**

inc/actions/chord_action.h

@@ -100,8 +100,7 @@ chord_action_init_loaded (ChordAction * self);
  * @param chords_before Chord descriptors, if
  *   changing all chords.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 chord_action_new (
   const ChordDescriptor ** chords_before,
   const ChordDescriptor ** chords_after,
@@ -109,8 +108,7 @@ chord_action_new (
   const int                chord_idx,
   GError **                error);
 
-NONNULL
-ChordAction *
+NONNULL ChordAction *
 chord_action_clone (const ChordAction * src);
 
 /**

inc/actions/midi_mapping_action.h

@@ -89,8 +89,7 @@ midi_mapping_action_init_loaded (MidiMappingAction * self);
 /**
  * Creates a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 midi_mapping_action_new_enable (
   int       idx,
   bool      enable,
@@ -99,8 +98,7 @@ midi_mapping_action_new_enable (
 /**
  * Creates a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 midi_mapping_action_new_bind (
   midi_byte_t * buf,
   ExtPort *     device_port,
@@ -110,12 +108,10 @@ midi_mapping_action_new_bind (
 /**
  * Creates a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 midi_mapping_action_new_unbind (int idx, GError ** error);
 
-NONNULL
-MidiMappingAction *
+NONNULL MidiMappingAction *
 midi_mapping_action_clone (const MidiMappingAction * src);
 
 /**

inc/actions/mixer_selections_action.h

@@ -186,8 +186,7 @@ mixer_selections_action_init_loaded (
  * @param num_plugins The number of plugins to create,
  *   if creating plugins.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 mixer_selections_action_new (
   MixerSelections *              ms,
   const PortConnectionsManager * connections_mgr,
@@ -229,8 +228,7 @@ mixer_selections_action_new (
     ms, port_connections_mgr, \
     MIXER_SELECTIONS_ACTION_DELETE, 0, 0, 0, NULL, 0, error)
 
-NONNULL
-MixerSelectionsAction *
+NONNULL MixerSelectionsAction *
 mixer_selections_action_clone (
   const MixerSelectionsAction * src);
 

inc/actions/port_action.h

@@ -65,8 +65,7 @@ port_action_init_loaded (PortAction * self);
 /**
  * Create a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 port_action_new (
   PortActionType   type,
   PortIdentifier * port_id,
@@ -77,14 +76,12 @@ port_action_new (
 /**
  * Create a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 port_action_new_reset_control (
   PortIdentifier * port_id,
   GError **        error);
 
-NONNULL
-PortAction *
+NONNULL PortAction *
 port_action_clone (const PortAction * src);
 
 bool

inc/actions/port_connection_action.h

@@ -79,8 +79,7 @@ port_connection_action_init_loaded (
 /**
  * Create a new action.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 port_connection_action_new (
   PortConnectionActionType type,
   PortIdentifier *         src_id,
@@ -110,8 +109,7 @@ port_connection_action_new (
     PORT_CONNECTION_CHANGE_MULTIPLIER, src_id, dest_id, \
     new_multiplier, error)
 
-NONNULL
-PortConnectionAction *
+NONNULL PortConnectionAction *
 port_connection_action_clone (
   const PortConnectionAction * src);
 

inc/actions/range_action.h

@@ -101,8 +101,7 @@ range_action_init_loaded (RangeAction * self);
  * @param start_pos Range start.
  * @param end_pos Range end.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 range_action_new (
   RangeActionType type,
   Position *      start_pos,
@@ -116,8 +115,7 @@ range_action_new (
 #define range_action_new_remove(start, end, error) \
   range_action_new (RANGE_ACTION_REMOVE, start, end, error)
 
-NONNULL
-RangeAction *
+NONNULL RangeAction *
 range_action_clone (const RangeAction * src);
 
 bool

inc/actions/tracklist_selections.h

@@ -384,8 +384,7 @@ tracklist_selections_action_init_loaded (
  *   if @ref tls_before and @ref tls_after are NULL.
  * @param error To be filled in if an error occurred.
  */
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 tracklist_selections_action_new (
   TracklistSelectionsActionType  type,
   TracklistSelections *          tls_before,
@@ -719,8 +718,7 @@ tracklist_selections_action_new (
     port_connections_mgr, NULL, 0, NULL, NULL, -1, -1, NULL, \
     -1, 0, false, NULL, 0.f, 0.f, NULL, false, err)
 
-NONNULL
-TracklistSelectionsAction *
+NONNULL TracklistSelectionsAction *
 tracklist_selections_action_clone (
   const TracklistSelectionsAction * src);
 

inc/actions/transport_action.h

@@ -88,16 +88,14 @@ static const cyaml_schema_value_t transport_action_schema = {
 void
 transport_action_init_loaded (TransportAction * self);
 
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 transport_action_new_bpm_change (
   bpm_t     bpm_before,
   bpm_t     bpm_after,
   bool      already_done,
   GError ** error);
 
-WARN_UNUSED_RESULT
-UndoableAction *
+WARN_UNUSED_RESULT UndoableAction *
 transport_action_new_time_sig_change (
   TransportActionType type,
   int                 before,
@@ -105,8 +103,7 @@ transport_action_new_time_sig_change (
   bool                already_done,
   GError **           error);
 
-NONNULL
-TransportAction *
+NONNULL TransportAction *
 transport_action_clone (const TransportAction * src);
 
 bool

inc/actions/undo_manager.h

@@ -70,31 +70,27 @@ static const cyaml_schema_value_t undo_manager_schema = {
  * Inits the undo manager by populating the
  * undo/redo stacks.
  */
-NONNULL
-void
+NONNULL void
 undo_manager_init_loaded (UndoManager * self);
 
 /**
  * Inits the undo manager by creating the undo/redo
  * stacks.
  */
-WARN_UNUSED_RESULT
-UndoManager *
+WARN_UNUSED_RESULT UndoManager *
 undo_manager_new (void);
 
 /**
  * Undo last action.
  */
 NONNULL_ARGS (1)
-int
-undo_manager_undo (UndoManager * self, GError ** error);
+int undo_manager_undo (UndoManager * self, GError ** error);
 
 /**
  * Redo last undone action.
  */
 NONNULL_ARGS (1)
-int
-undo_manager_redo (UndoManager * self, GError ** error);
+int undo_manager_redo (UndoManager * self, GError ** error);
 
 /**
  * Performs the action and pushes it to the undo
@@ -103,8 +99,7 @@ undo_manager_redo (UndoManager * self, GError ** error);
  * @return Non-zero if error.
  */
 NONNULL_ARGS (1, 2)
-int
-undo_manager_perform (
+int undo_manager_perform (
   UndoManager *    self,
   UndoableAction * action,
   GError **        error);
@@ -133,8 +128,7 @@ undo_manager_perform (
  * Returns whether the given clip is used by any
  * stack.
  */
-NONNULL
-bool
+NONNULL bool
 undo_manager_contains_clip (
   UndoManager * self,
   AudioClip *   clip);
@@ -144,31 +138,26 @@ undo_manager_contains_clip (
  *
  * Used when cleaning up state dirs.
  */
-NONNULL
-void
+NONNULL void
 undo_manager_get_plugins (UndoManager * self, GPtrArray * arr);
 
 /**
  * Returns the last performed action, or NULL if
  * the stack is empty.
  */
-NONNULL
-UndoableAction *
+NONNULL UndoableAction *
 undo_manager_get_last_action (UndoManager * self);
 
 /**
  * Clears the undo and redo stacks.
  */
-NONNULL
-void
+NONNULL void
 undo_manager_clear_stacks (UndoManager * self, bool free);
 
-NONNULL
-UndoManager *
+NONNULL UndoManager *
 undo_manager_clone (const UndoManager * src);
 
-NONNULL
-void
+NONNULL void
 undo_manager_free (UndoManager * self);
 
 /**

inc/actions/undo_stack.h

@@ -150,8 +150,7 @@ undo_stack_init_loaded (UndoStack * self);
 UndoStack *
 undo_stack_new (void);
 
-NONNULL
-UndoStack *
+NONNULL UndoStack *
 undo_stack_clone (const UndoStack * src);
 
 /**
@@ -165,8 +164,7 @@ undo_stack_get_as_string (UndoStack * self, int limit);
  *
  * Used when loading projects and for error checking.
  */
-NONNULL
-size_t
+NONNULL size_t
 undo_stack_get_total_cached_actions (UndoStack * self);
 
 /* --- start wrappers --- */
@@ -212,8 +210,7 @@ undo_stack_contains_action (
 /**
  * Returns the plugins referred to in the undo stack.
  */
-NONNULL
-void
+NONNULL void
 undo_stack_get_plugins (UndoStack * self, GPtrArray * arr);
 
 /**

inc/actions/undoable_action.h

@@ -137,15 +137,13 @@ static const cyaml_schema_value_t undoable_action_schema = {
     undoable_action_fields_schema),
 };
 
-NONNULL
-void
+NONNULL void
 undoable_action_init_loaded (UndoableAction * self);
 
 /**
  * Initializer to be used by implementing actions.
  */
-NONNULL
-void
+NONNULL void
 undoable_action_init (
   UndoableAction *   self,
   UndoableActionType type);
@@ -154,8 +152,7 @@ undoable_action_init (
  * Returns whether the action requires pausing
  * the engine.
  */
-NONNULL
-bool
+NONNULL bool
 undoable_action_needs_pause (UndoableAction * self);
 
 /**
@@ -166,22 +163,19 @@ undoable_action_needs_pause (UndoableAction * self);
  * the pool for actions that can't contain audio
  * clips.
  */
-NONNULL
-bool
+NONNULL bool
 undoable_action_can_contain_clip (UndoableAction * self);
 
 /**
  * Checks whether the action actually contains or
  * refers to the given audio clip.
  */
-NONNULL
-bool
+NONNULL bool
 undoable_action_contains_clip (
   UndoableAction * self,
   AudioClip *      clip);
 
-NONNULL
-void
+NONNULL void
 undoable_action_get_plugins (
   UndoableAction * self,
   GPtrArray *      arr);
@@ -192,8 +186,7 @@ undoable_action_get_plugins (
  * This should be set on the last action to be
  * performed.
  */
-NONNULL
-void
+NONNULL void
 undoable_action_set_num_actions (
   UndoableAction * self,
   int              num_actions);
@@ -208,8 +201,7 @@ undoable_action_set_num_actions (
  * @param after Pointer to the connections after.
  */
 NONNULL_ARGS (1)
-void
-undoable_action_save_or_load_port_connections (
+void undoable_action_save_or_load_port_connections (
   UndoableAction *          self,
   bool                      _do,
   PortConnectionsManager ** before,
@@ -223,8 +215,7 @@ undoable_action_save_or_load_port_connections (
  * @return Non-zero if errors occurred.
  */
 NONNULL_ARGS (1)
-int
-undoable_action_do (UndoableAction * self, GError ** error);
+int undoable_action_do (UndoableAction * self, GError ** error);
 
 /**
  * Undoes the action.
@@ -232,8 +223,9 @@ undoable_action_do (UndoableAction * self, GError ** error);
  * @return Non-zero if errors occurred.
  */
 NONNULL_ARGS (1)
-int
-undoable_action_undo (UndoableAction * self, GError ** error);
+int undoable_action_undo (
+  UndoableAction * self,
+  GError **        error);
 
 void
 undoable_action_free (UndoableAction * self);
@@ -244,8 +236,7 @@ undoable_action_free (UndoableAction * self);
  *
  * The string MUST be free'd using g_free().
  */
-NONNULL
-char *
+NONNULL char *
 undoable_action_to_string (UndoableAction * ua);
 
 /**

inc/audio/audio_region.h

@@ -118,8 +118,7 @@ audio_region_set_clip_id (ZRegion * self, int clip_id);
  *
  * @return Whether successful.
  */
-WARN_UNUSED_RESULT
-bool
+WARN_UNUSED_RESULT bool
 audio_region_replace_frames (
   ZRegion *        self,
   float *          frames,

inc/audio/automation_point.h

@@ -196,8 +196,7 @@ automation_point_is_equal (
  * Returns if the curve of the AutomationPoint
  * curves upwards as you move right on the x axis.
  */
-NONNULL
-bool
+NONNULL bool
 automation_point_curves_up (AutomationPoint * self);
 
 /**

inc/audio/automation_region.h

@@ -65,8 +65,7 @@ automation_region_add_ap (
  * Returns the AutomationPoint before the given
  * one.
  */
-NONNULL
-PURE AutomationPoint *
+NONNULL PURE AutomationPoint *
 automation_region_get_prev_ap (
   ZRegion *         self,
   AutomationPoint * ap);
@@ -128,8 +127,7 @@ automation_region_get_ap_around (
   bool       before_only,
   bool       use_snapshots);
 
-NONNULL
-bool
+NONNULL bool
 automation_region_validate (ZRegion * self);
 
 /**
@@ -137,8 +135,7 @@ automation_region_validate (ZRegion * self);
  *
  * Regions should be free'd using region_free.
  */
-NONNULL
-void
+NONNULL void
 automation_region_free_members (ZRegion * self);
 
 /**

inc/audio/automation_track.h

@@ -207,12 +207,10 @@ COLD NONNULL_ARGS (1) void automation_track_init_loaded (
  * Creates an automation track for the given
  * Port.
  */
-NONNULL
-AutomationTrack *
+NONNULL AutomationTrack *
 automation_track_new (Port * port);
 
-NONNULL
-bool
+NONNULL bool
 automation_track_validate (AutomationTrack * self);
 
 /**
@@ -237,8 +235,7 @@ automation_record_mode_get_localized (
  * @param basic_search If true, only basic port
  *   identifier members are checked.
  */
-NONNULL
-AutomationTrack *
+NONNULL AutomationTrack *
 automation_track_find_from_port_id (
   PortIdentifier * id,
   bool             basic_search);
@@ -262,16 +259,14 @@ automation_track_set_automation_mode (
   AutomationMode    mode,
   bool              fire_events);
 
-NONNULL
-static inline void
+NONNULL static inline void
 automation_track_swap_record_mode (AutomationTrack * self)
 {
   self->record_mode =
     (self->record_mode + 1) % NUM_AUTOMATION_RECORD_MODES;
 }
 
-NONNULL
-AutomationTracklist *
+NONNULL AutomationTracklist *
 automation_track_get_automation_tracklist (
   AutomationTrack * self);
 
@@ -322,8 +317,7 @@ automation_track_should_be_recording (
  * @note This must not be used directly. Use
  *   track_add_region() instead.
  */
-NONNULL
-void
+NONNULL void
 automation_track_add_region (
   AutomationTrack * self,
   ZRegion *         region);
@@ -335,8 +329,7 @@ automation_track_add_region (
  * @note This must not be used directly. Use
  *   track_insert_region() instead.
  */
-NONNULL
-void
+NONNULL void
 automation_track_insert_region (
   AutomationTrack * self,
   ZRegion *         region,
@@ -358,8 +351,7 @@ automation_track_insert_region (
  *   positions based on ticks (true) or frames
  *   (false).
  */
-NONNULL
-void
+NONNULL void
 automation_track_update_positions (
   AutomationTrack * self,
   bool              from_ticks,
@@ -369,19 +361,16 @@ automation_track_update_positions (
  * Sets the index of the AutomationTrack in the
  * AutomationTracklist.
  */
-NONNULL
-void
+NONNULL void
 automation_track_set_index (AutomationTrack * self, int index);
 
 /**
  * Clones the AutomationTrack.
  */
-NONNULL
-AutomationTrack *
+NONNULL AutomationTrack *
 automation_track_clone (AutomationTrack * src);
 
-NONNULL
-Track *
+NONNULL Track *
 automation_track_get_track (AutomationTrack * self);
 
 /**
@@ -393,8 +382,7 @@ automation_track_get_track (AutomationTrack * self);
  *   the region surrounds \ref pos), otherwise
  *   check in the region that ends last.
  */
-NONNULL
-AutomationPoint *
+NONNULL AutomationPoint *
 automation_track_get_ap_before_pos (
   const AutomationTrack * self,
   const Position *        pos,
@@ -420,15 +408,13 @@ automation_track_get_region_before_pos (
 /**
  * Unselects all arranger objects.
  */
-NONNULL
-void
+NONNULL void
 automation_track_unselect_all (AutomationTrack * self);
 
 /**
  * Removes a region from the automation track.
  */
-NONNULL
-void
+NONNULL void
 automation_track_remove_region (
   AutomationTrack * self,
   ZRegion *         region);
@@ -437,8 +423,7 @@ automation_track_remove_region (
  * Removes and frees all arranger objects
  * recursively.
  */
-NONNULL
-void
+NONNULL void
 automation_track_clear (AutomationTrack * self);
 
 /**
@@ -456,8 +441,7 @@ automation_track_clear (AutomationTrack * self);
  *   snapshotted (cached) regions. This should be set to true
  *   when called during dsp playback. TODO unimplemented
  */
-NONNULL
-float
+NONNULL float
 automation_track_get_val_at_pos (
   AutomationTrack * self,
   Position *        pos,
@@ -469,8 +453,7 @@ automation_track_get_val_at_pos (
  * Returns the y pixels from the value based on the
  * allocation of the automation track.
  */
-NONNULL
-int
+NONNULL int
 automation_track_get_y_px_from_normalized_val (
   AutomationTrack * self,
   float             normalized_val);
@@ -485,30 +468,25 @@ automation_track_get_port (
 /**
  * Gets the last ZRegion in the AutomationTrack.
  */
-NONNULL
-ZRegion *
+NONNULL ZRegion *
 automation_track_get_last_region (AutomationTrack * self);
 
-NONNULL
-void
+NONNULL void
 automation_track_set_caches (
   AutomationTrack * self,
   CacheTypes        types);
 
-NONNULL
-bool
+NONNULL bool
 automation_track_contains_automation (
   const AutomationTrack * self);
 
-NONNULL
-bool
+NONNULL bool
 automation_track_verify (AutomationTrack * self);
 
 /**
  * Frees the automation track.
  */
-NONNULL
-void
+NONNULL void
 automation_track_free (AutomationTrack * at);
 
 #endif // __AUDIO_AUTOMATION_TRACK_H__

inc/audio/automation_tracklist.h

@@ -279,17 +279,14 @@ automation_tracklist_get_plugin_at (
   const int             port_index,
   const char *          symbol);
 
-WARN_UNUSED_RESULT
-NONNULL
-AutomationTrack *
+WARN_UNUSED_RESULT NONNULL AutomationTrack *
 automation_tracklist_get_first_invisible_at (
   AutomationTracklist * self);
 
 /**
  * Returns the number of visible AutomationTrack's.
  */
-NONNULL
-int
+NONNULL int
 automation_tracklist_get_num_visible (
   AutomationTracklist * self);
 
@@ -299,33 +296,27 @@ automation_tracklist_get_num_visible (
  *
  * @return True if pass.
  */
-NONNULL
-bool
+NONNULL bool
 automation_tracklist_validate (AutomationTracklist * self);
 
 /**
  * Counts the total number of regions in the
  * automation tracklist.
  */
-WARN_UNUSED_RESULT
-NONNULL
-int
+WARN_UNUSED_RESULT NONNULL int
 automation_tracklist_get_num_regions (
   AutomationTracklist * self);
 
-NONNULL
-void
+NONNULL void
 automation_tracklist_print_regions (
   AutomationTracklist * self);
 
-NONNULL
-void
+NONNULL void
 automation_tracklist_set_caches (
   AutomationTracklist * self,
   CacheTypes            types);
 
-NONNULL
-void
+NONNULL void
 automation_tracklist_free_members (AutomationTracklist * self);
 
 /**

inc/audio/channel.h

@@ -271,8 +271,7 @@ static const cyaml_schema_value_t channel_schema = {
   YAML_VALUE_PTR (Channel, channel_fields_schema),
 };
 
-NONNULL
-void
+NONNULL void
 channel_init_loaded (Channel * channel, Track * track);
 
 /**
@@ -285,8 +284,7 @@ channel_init_loaded (Channel * channel, Track * track);
  * @param g_frames_start Global start frames.
  * @param nframes Number of frames to process.
  */
-NONNULL
-void
+NONNULL void
 channel_handle_recording (
   Channel *       self,
   const long      g_frames_start,
@@ -302,15 +300,13 @@ channel_append_ports (
   GPtrArray * ports,
   bool        include_plugins);
 
-NONNULL
-void
+NONNULL void
 channel_set_magic (Channel * self);
 
 /**
  * Exposes the channel's ports to the backend.
  */
-NONNULL
-void
+NONNULL void
 channel_expose_ports_to_backend (Channel * ch);
 
 /**
@@ -321,34 +317,28 @@ channel_expose_ports_to_backend (Channel * ch);
 void
 channel_connect (Channel * ch);
 
-NONNULL
-void
+NONNULL void
 channel_set_phase (void * channel, float phase);
 
-NONNULL
-float
+NONNULL float
 channel_get_phase (void * channel);
 
-NONNULL
-void
+NONNULL void
 channel_set_balance_control (void * _channel, float pan);
 
 /**
  * Adds to (or subtracts from) the pan.
  */
-NONNULL
-void
+NONNULL void
 channel_add_balance_control (void * _channel, float pan);
 
-NONNULL
-float
+NONNULL float
 channel_get_balance_control (void * _channel);
 
 /**
  * Sets fader to 0.0.
  */
-NONNULL
-void
+NONNULL void
 channel_reset_fader (Channel * self, bool fire_events);
 
 /**
@@ -357,16 +347,14 @@ channel_reset_fader (Channel * self, bool fire_events);
  * To be called before the main cycle each time on
  * all channels.
  */
-NONNULL
-void
+NONNULL void
 channel_prepare_process (Channel * channel);
 
 /**
  * Creates a channel of the given type with the
  * given label.
  */
-NONNULL
-Channel *
+NONNULL Channel *
 channel_new (Track * track);
 
 /**
@@ -377,8 +365,7 @@ channel_new (Track * track);
  * Normally, the channel will call the process func on each of its plugins
  * in order.
  */
-NONNULL
-void
+NONNULL void
 channel_process (Channel * channel);
 
 /**
@@ -403,8 +390,7 @@ channel_process (Channel * channel);
  *
  * @return true if plugin added, false if not.
  */
-NONNULL
-bool
+NONNULL bool
 channel_add_plugin (
   Channel *      channel,
   PluginSlotType slot_type,
@@ -416,28 +402,24 @@ channel_add_plugin (
   bool           recalc_graph,
   bool           pub_events);
 
-NONNULL
-Track *
+NONNULL Track *
 channel_get_track (Channel * self);
 
-NONNULL
-Track *
+NONNULL Track *
 channel_get_output_track (Channel * self);
 
 /**
  * Called when the input has changed for Midi,
  * Instrument or Audio tracks.
  */
-NONNULL
-void
+NONNULL void
 channel_reconnect_ext_input_ports (Channel * ch);
 
 /**
  * Convenience function to get the automation track
  * of the given type for the channel.
  */
-NONNULL
-AutomationTrack *
+NONNULL AutomationTrack *
 channel_get_automation_track (
   Channel * channel,
   PortFlags port_flags);
@@ -458,8 +440,7 @@ channel_get_automation_track (
  *   deleted at this time.
  * @param recalc_graph Recalculate mixer graph.
  */
-NONNULL
-void
+NONNULL void
 channel_remove_plugin (
   Channel *      channel,
   PluginSlotType slot_type,
@@ -473,29 +454,25 @@ channel_remove_plugin (
  * Updates the track name hash in the channel and
  * all related ports and identifiers.
  */
-NONNULL
-void
+NONNULL void
 channel_update_track_name_hash (
   Channel *    self,
   unsigned int old_name_hash,
   unsigned int new_name_hash);
 
-NONNULL
-int
+NONNULL int
 channel_get_plugins (Channel * self, Plugin ** pls);
 
 /**
  * Gets whether mono compatibility is enabled.
  */
-NONNULL
-bool
+NONNULL bool
 channel_get_mono_compat_enabled (Channel * self);
 
 /**
  * Sets whether mono compatibility is enabled.
  */
-NONNULL
-void
+NONNULL void
 channel_set_mono_compat_enabled (
   Channel * self,
   bool      enabled,
@@ -504,15 +481,13 @@ channel_set_mono_compat_enabled (
 /**
  * Gets whether mono compatibility is enabled.
  */
-NONNULL
-bool
+NONNULL bool
 channel_get_swap_phase (Channel * self);
 
 /**
  * Sets whether mono compatibility is enabled.
  */
-NONNULL
-void
+NONNULL void
 channel_set_swap_phase (
   Channel * self,
   bool      enabled,
@@ -531,8 +506,7 @@ channel_select_all (
 /**
  * Sets caches for processing.
  */
-NONNULL
-void
+NONNULL void
 channel_set_caches (Channel * self);
 
 /**
@@ -547,8 +521,10 @@ channel_set_caches (Channel * self);
  *   channel.
  */
 NONNULL_ARGS (1, 2)
-Channel *
-channel_clone (Channel * ch, Track * track, GError ** error);
+Channel * channel_clone (
+  Channel * ch,
+  Track *   track,
+  GError ** error);
 
 /**
  * Disconnects the channel from the processing
@@ -563,8 +539,7 @@ channel_clone (Channel * ch, Track * track, GError ** error);
  *   Channel. Useful when deleting the channel.
  * @param recalc_graph Recalculate mixer graph.
  */
-NONNULL
-void
+NONNULL void
 channel_disconnect (Channel * channel, bool remove_pl);
 
 /**
@@ -581,8 +556,7 @@ channel_widget_generate_context_menu_for_track (Track * track);
  * themselves in normal circumstances. Use
  * track_free() to free them.
  */
-NONNULL
-void
+NONNULL void
 channel_free (Channel * channel);
 
 /**

inc/audio/channel_send.h

@@ -150,8 +150,9 @@ static const cyaml_schema_value_t channel_send_schema = {
 };
 
 NONNULL_ARGS (1)
-void
-channel_send_init_loaded (ChannelSend * self, Track * track);
+void channel_send_init_loaded (
+  ChannelSend * self,
+  Track *       track);
 
 /**
  * Creates a channel send instance.
@@ -165,12 +166,10 @@ channel_send_new (
 /**
  * Gets the owner track.
  */
-NONNULL
-Track *
+NONNULL Track *
 channel_send_get_track (const ChannelSend * self);
 
-NONNULL
-bool
+NONNULL bool
 channel_send_is_enabled (const ChannelSend * self);
 
 #define channel_send_is_empty(x) \
@@ -180,8 +179,7 @@ channel_send_is_enabled (const ChannelSend * self);
  * Returns whether the channel send target is a
  * sidechain port (rather than a target track).
  */
-NONNULL
-bool
+NONNULL bool
 channel_send_is_target_sidechain (ChannelSend * self);
 
 /**
@@ -200,22 +198,19 @@ channel_send_get_target_track (
  *
  * Returned StereoPorts instance must be free'd.
  */
-NONNULL
-StereoPorts *
+NONNULL StereoPorts *
 channel_send_get_target_sidechain (ChannelSend * self);
 
 /**
  * Gets the amount to be used in widgets (0.0-1.0).
  */
-NONNULL
-float
+NONNULL float
 channel_send_get_amount_for_widgets (ChannelSend * self);
 
 /**
  * Sets the amount from a widget amount (0.0-1.0).
  */
-NONNULL
-void
+NONNULL void
 channel_send_set_amount_from_widget (
   ChannelSend * self,
   float         val);
@@ -240,8 +235,7 @@ channel_send_connect_stereo (
 /**
  * Connects a send to a midi port.
  */
-NONNULL
-bool
+NONNULL bool
 channel_send_connect_midi (
   ChannelSend * self,
   Port *        port,
@@ -252,34 +246,28 @@ channel_send_connect_midi (
 /**
  * Removes the connection at the given send.
  */
-NONNULL
-void
+NONNULL void
 channel_send_disconnect (ChannelSend * self, bool recalc_graph);
 
-NONNULL
-void
+NONNULL void
 channel_send_set_amount (ChannelSend * self, float amount);
 
 /**
  * Get the name of the destination, or a placeholder
  * text if empty.
  */
-NONNULL
-void
+NONNULL void
 channel_send_get_dest_name (ChannelSend * self, char * buf);
 
-NONNULL
-void
+NONNULL void
 channel_send_copy_values (
   ChannelSend *       dest,
   const ChannelSend * src);
 
-NONNULL
-ChannelSend *
+NONNULL ChannelSend *
 channel_send_clone (const ChannelSend * src);
 
-NONNULL
-ChannelSendWidget *
+NONNULL ChannelSendWidget *
 channel_send_find_widget (ChannelSend * self);
 
 /**
@@ -329,16 +317,13 @@ channel_send_is_connected_to (
 /**
  * Finds the project send from a given send instance.
  */
-NONNULL
-ChannelSend *
+NONNULL ChannelSend *
 channel_send_find (ChannelSend * self);
 
-NONNULL
-bool
+NONNULL bool
 channel_send_validate (ChannelSend * self);
 
-NONNULL
-void
+NONNULL void
 channel_send_free (ChannelSend * self);
 
 /**