Browse Source

clang-format: set column limit from 52 -> 51

audio_region_bpm_change_fix
Alexandros Theodotou 4 months ago
parent
commit
e0f3768684
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 2
      .clang-format
  2. 6
      inc/actions/actions.h
  3. 36
      inc/actions/arranger_selections.h
  4. 20
      inc/actions/channel_send_action.h
  5. 17
      inc/actions/chord_action.h
  6. 44
      inc/actions/mixer_selections_action.h
  7. 7
      inc/actions/port_action.h
  8. 8
      inc/actions/port_connection_action.h
  9. 92
      inc/actions/range_action.h
  10. 190
      inc/actions/tracklist_selections.h
  11. 3
      inc/actions/transport_action.h
  12. 14
      inc/actions/undo_manager.h
  13. 10
      inc/actions/undo_stack.h
  14. 2
      inc/audio/audio_region.h
  15. 3
      inc/audio/automation_point.h
  16. 14
      inc/audio/automation_track.h
  17. 78
      inc/audio/channel_send.h
  18. 3
      inc/audio/chord_descriptor.h
  19. 17
      inc/audio/chord_object.h
  20. 11
      inc/audio/control_room.h
  21. 11
      inc/audio/curve.h
  22. 27
      inc/audio/engine.h
  23. 3
      inc/audio/exporter.h
  24. 4
      inc/audio/ext_port.h
  25. 22
      inc/audio/fader.h
  26. 4
      inc/audio/foldable_track.h
  27. 7
      inc/audio/graph_node.h
  28. 28
      inc/audio/marker.h
  29. 4
      inc/audio/metronome.h
  30. 11
      inc/audio/midi_mapping.h
  31. 3
      inc/audio/midi_note.h
  32. 6
      inc/audio/midi_region.h
  33. 7
      inc/audio/pool.h
  34. 18
      inc/audio/port.h
  35. 23
      inc/audio/port_identifier.h
  36. 4
      inc/audio/position.h
  37. 6
      inc/audio/quantize_options.h
  38. 6
      inc/audio/rack_controller.h
  39. 3
      inc/audio/recording_event.h
  40. 3
      inc/audio/region.h
  41. 7
      inc/audio/region_identifier.h
  42. 8
      inc/audio/rtaudio_device.h
  43. 9
      inc/audio/sample_processor.h
  44. 127
      inc/audio/scale.h
  45. 14
      inc/audio/scale_object.h
  46. 19
      inc/audio/snap_grid.h
  47. 3
      inc/audio/supported_file.h
  48. 36
      inc/audio/track.h
  49. 9
      inc/audio/track_lane.h
  50. 3
      inc/audio/tracklist.h
  51. 6
      inc/audio/velocity.h
  52. 37
      inc/gui/backend/arranger_object.h
  53. 7
      inc/gui/backend/arranger_selections.h
  54. 3
      inc/gui/backend/audio_selections.h
  55. 13
      inc/gui/backend/chord_editor.h
  56. 3
      inc/gui/backend/chord_selections.h
  57. 3
      inc/gui/backend/mixer_selections.h
  58. 7
      inc/gui/backend/piano_roll.h
  59. 7
      inc/gui/backend/timeline_selections.h
  60. 3
      inc/gui/widgets/arranger.h
  61. 11
      inc/gui/widgets/automation_track.h
  62. 3
      inc/gui/widgets/bot_bar.h
  63. 3
      inc/gui/widgets/cc_bindings.h
  64. 6
      inc/gui/widgets/center_dock.h
  65. 3
      inc/gui/widgets/channel.h
  66. 3
      inc/gui/widgets/chord_region.h
  67. 3
      inc/gui/widgets/clip_editor.h
  68. 5
      inc/gui/widgets/clip_editor_inner.h
  69. 3
      inc/gui/widgets/custom_button.h
  70. 7
      inc/gui/widgets/dialogs/quantize_dialog.h
  71. 3
      inc/gui/widgets/dialogs/track_icon_chooser_dialog.h
  72. 2
      inc/gui/widgets/digital_meter.h
  73. 3
      inc/gui/widgets/fader.h
  74. 3
      inc/gui/widgets/fader_controls_grid.h
  75. 6
      inc/gui/widgets/folder_channel.h
  76. 6
      inc/gui/widgets/header.h
  77. 3
      inc/gui/widgets/home_toolbar.h
  78. 5
      inc/gui/widgets/inspector_track.h
  79. 3
      inc/gui/widgets/knob.h
  80. 10
      inc/gui/widgets/main_window.h
  81. 3
      inc/gui/widgets/meter.h
  82. 3
      inc/gui/widgets/mixer.h
  83. 8
      inc/gui/widgets/modulator_inner.h
  84. 3
      inc/gui/widgets/modulator_macro.h
  85. 7
      inc/gui/widgets/modulator_view.h
  86. 9
      inc/gui/widgets/monitor_section.h
  87. 2
      inc/gui/widgets/panel_file_browser.h
  88. 3
      inc/gui/widgets/route_target_selector.h
  89. 6
      inc/gui/widgets/ruler.h
  90. 5
      inc/gui/widgets/snap_grid_popover.h
  91. 3
      inc/gui/widgets/timeline_selection_info.h
  92. 6
      inc/gui/widgets/top_bar.h
  93. 6
      inc/gui/widgets/track.h
  94. 3
      inc/plugins/carla_native_plugin.h
  95. 3
      inc/plugins/collection.h
  96. 3
      inc/plugins/lv2/lv2_state.h
  97. 6
      inc/plugins/lv2/lv2_worker.h
  98. 4
      inc/plugins/lv2_plugin.h
  99. 3
      inc/plugins/plugin.h
  100. 17
      inc/plugins/plugin_identifier.h
  101. Some files were not shown because too many files have changed in this diff Show More

2
.clang-format

@ -62,7 +62,7 @@ BreakConstructorInitializersBeforeComma: false @@ -62,7 +62,7 @@ BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakStringLiterals: false
ContinuationIndentWidth: 2
ColumnLimit: 52
ColumnLimit: 51
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false

6
inc/actions/actions.h

@ -408,7 +408,8 @@ activate_delete_cc_binding ( @@ -408,7 +408,8 @@ activate_delete_cc_binding (
COLD DECLARE_SIMPLE (activate_show_file_browser);
DECLARE_SIMPLE (
activate_toggle_timeline_event_viewer);
DECLARE_SIMPLE (activate_toggle_editor_event_viewer);
DECLARE_SIMPLE (
activate_toggle_editor_event_viewer);
DECLARE_SIMPLE (activate_insert_silence);
DECLARE_SIMPLE (activate_remove_range);
@ -418,7 +419,8 @@ DECLARE_SIMPLE ( @@ -418,7 +419,8 @@ DECLARE_SIMPLE (
change_state_timeline_playhead_follow);
DECLARE_SIMPLE (
change_state_editor_playhead_scroll_edges);
DECLARE_SIMPLE (change_state_editor_playhead_follow);
DECLARE_SIMPLE (
change_state_editor_playhead_follow);
/* Editor functions. */
DECLARE_SIMPLE (activate_editor_function);

36
inc/actions/arranger_selections.h

@ -167,15 +167,17 @@ typedef enum ArrangerSelectionsActionEditType @@ -167,15 +167,17 @@ typedef enum ArrangerSelectionsActionEditType
static const cyaml_strval_t
arranger_selections_action_edit_type_strings[] = {
{"Name", ARRANGER_SELECTIONS_ACTION_EDIT_NAME },
{ "Pos", ARRANGER_SELECTIONS_ACTION_EDIT_POS },
{"Name", ARRANGER_SELECTIONS_ACTION_EDIT_NAME},
{ "Pos", ARRANGER_SELECTIONS_ACTION_EDIT_POS },
{ "Primitive",
ARRANGER_SELECTIONS_ACTION_EDIT_PRIMITIVE },
{ "Scale", ARRANGER_SELECTIONS_ACTION_EDIT_SCALE},
{ "Fades", ARRANGER_SELECTIONS_ACTION_EDIT_FADES},
{ "Mute", ARRANGER_SELECTIONS_ACTION_EDIT_MUTE },
ARRANGER_SELECTIONS_ACTION_EDIT_PRIMITIVE },
{ "Scale",
ARRANGER_SELECTIONS_ACTION_EDIT_SCALE },
{ "Fades",
ARRANGER_SELECTIONS_ACTION_EDIT_FADES },
{ "Mute", ARRANGER_SELECTIONS_ACTION_EDIT_MUTE},
{ "Editor function",
ARRANGER_SELECTIONS_ACTION_EDIT_EDITOR_FUNCTION },
ARRANGER_SELECTIONS_ACTION_EDIT_EDITOR_FUNCTION },
};
/**
@ -302,7 +304,9 @@ static const cyaml_schema_field_t arranger_selections_action_fields_schema[] = { @@ -302,7 +304,9 @@ static const cyaml_schema_field_t arranger_selections_action_fields_schema[] = {
YAML_FIELD_INT (
ArrangerSelectionsAction,
delta_pitch),
YAML_FIELD_INT (ArrangerSelectionsAction, delta_vel),
YAML_FIELD_INT (
ArrangerSelectionsAction,
delta_vel),
YAML_FIELD_FLOAT (
ArrangerSelectionsAction,
delta_normalized_amount),
@ -481,15 +485,15 @@ arranger_selections_action_new_move_or_duplicate ( @@ -481,15 +485,15 @@ arranger_selections_action_new_move_or_duplicate (
norm_amt, already_moved, error) \
arranger_selections_action_new_move_or_duplicate ( \
(ArrangerSelections *) sel, 1, ticks, chords, \
pitch, tracks, lanes, norm_amt, already_moved, \
error)
pitch, tracks, lanes, norm_amt, \
already_moved, error)
#define arranger_selections_action_new_duplicate( \
sel, ticks, chords, pitch, tracks, lanes, \
norm_amt, already_moved, error) \
arranger_selections_action_new_move_or_duplicate ( \
(ArrangerSelections *) sel, 0, ticks, chords, \
pitch, tracks, lanes, norm_amt, already_moved, \
error)
pitch, tracks, lanes, norm_amt, \
already_moved, error)
#define arranger_selections_action_new_move_timeline( \
sel, ticks, delta_tracks, delta_lanes, \
@ -736,15 +740,15 @@ arranger_selections_action_perform_move_or_duplicate ( @@ -736,15 +740,15 @@ arranger_selections_action_perform_move_or_duplicate (
norm_amt, already_moved, error) \
arranger_selections_action_perform_move_or_duplicate ( \
(ArrangerSelections *) sel, 1, ticks, chords, \
pitch, tracks, lanes, norm_amt, already_moved, \
error)
pitch, tracks, lanes, norm_amt, \
already_moved, error)
#define arranger_selections_action_perform_duplicate( \
sel, ticks, chords, pitch, tracks, lanes, \
norm_amt, already_moved, error) \
arranger_selections_action_perform_move_or_duplicate ( \
(ArrangerSelections *) sel, 0, ticks, chords, \
pitch, tracks, lanes, norm_amt, already_moved, \
error)
pitch, tracks, lanes, norm_amt, \
already_moved, error)
#define arranger_selections_action_perform_move_timeline( \
sel, ticks, delta_tracks, delta_lanes, \

20
inc/actions/channel_send_action.h

@ -157,19 +157,21 @@ channel_send_action_new ( @@ -157,19 +157,21 @@ channel_send_action_new (
send, stereo, error) \
channel_send_action_new ( \
send, CHANNEL_SEND_ACTION_CONNECT_STEREO, \
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, error)
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, \
error)
#define channel_send_action_new_connect_sidechain( \
send, stereo, error) \
channel_send_action_new ( \
send, CHANNEL_SEND_ACTION_CONNECT_SIDECHAIN, \
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, error)
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, \
error)
#define channel_send_action_new_change_amount( \
send, amt, error) \
channel_send_action_new ( \
send, CHANNEL_SEND_ACTION_CHANGE_AMOUNT, NULL, \
NULL, amt, NULL, error)
send, CHANNEL_SEND_ACTION_CHANGE_AMOUNT, \
NULL, NULL, amt, NULL, error)
NONNULL
ChannelSendAction *
@ -208,19 +210,21 @@ channel_send_action_perform ( @@ -208,19 +210,21 @@ channel_send_action_perform (
send, stereo, error) \
channel_send_action_perform ( \
send, CHANNEL_SEND_ACTION_CONNECT_STEREO, \
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, error)
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, \
error)
#define channel_send_action_perform_connect_sidechain( \
send, stereo, error) \
channel_send_action_perform ( \
send, CHANNEL_SEND_ACTION_CONNECT_SIDECHAIN, \
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, error)
NULL, stereo, 0.f, PORT_CONNECTIONS_MGR, \
error)
#define channel_send_action_perform_change_amount( \
send, amt, error) \
channel_send_action_perform ( \
send, CHANNEL_SEND_ACTION_CHANGE_AMOUNT, NULL, \
NULL, amt, NULL, error)
send, CHANNEL_SEND_ACTION_CHANGE_AMOUNT, \
NULL, NULL, amt, NULL, error)
int
channel_send_action_do (

17
inc/actions/chord_action.h

@ -104,12 +104,13 @@ static const cyaml_schema_field_t @@ -104,12 +104,13 @@ static const cyaml_schema_field_t
CYAML_FIELD_END
};
static const cyaml_schema_value_t chord_action_schema = {
CYAML_VALUE_MAPPING (
CYAML_FLAG_POINTER,
ChordAction,
chord_action_fields_schema),
};
static const cyaml_schema_value_t
chord_action_schema = {
CYAML_VALUE_MAPPING (
CYAML_FLAG_POINTER,
ChordAction,
chord_action_fields_schema),
};
void
chord_action_init_loaded (ChordAction * self);
@ -146,7 +147,9 @@ chord_action_perform ( @@ -146,7 +147,9 @@ chord_action_perform (
GError ** error);
int
chord_action_do (ChordAction * self, GError ** error);
chord_action_do (
ChordAction * self,
GError ** error);
int
chord_action_undo (

44
inc/actions/mixer_selections_action.h

@ -146,8 +146,12 @@ static const cyaml_schema_field_t @@ -146,8 +146,12 @@ static const cyaml_schema_field_t
YAML_FIELD_UINT (
MixerSelectionsAction,
to_track_name_hash),
YAML_FIELD_INT (MixerSelectionsAction, new_channel),
YAML_FIELD_INT (MixerSelectionsAction, num_plugins),
YAML_FIELD_INT (
MixerSelectionsAction,
new_channel),
YAML_FIELD_INT (
MixerSelectionsAction,
num_plugins),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
MixerSelectionsAction,
setting,
@ -212,15 +216,15 @@ mixer_selections_action_new ( @@ -212,15 +216,15 @@ mixer_selections_action_new (
const PortConnectionsManager * connections_mgr,
MixerSelectionsActionType type,
PluginSlotType slot_type,
unsigned int to_track_name_hash,
int to_slot,
PluginSetting * setting,
int num_plugins,
GError ** error);
unsigned int to_track_name_hash,
int to_slot,
PluginSetting * setting,
int num_plugins,
GError ** error);
#define mixer_selections_action_new_create( \
slot_type, to_tr, to_slot, setting, num_plugins, \
error) \
slot_type, to_tr, to_slot, setting, \
num_plugins, error) \
mixer_selections_action_new ( \
NULL, NULL, MIXER_SELECTIONS_ACTION_CREATE, \
slot_type, to_tr, to_slot, setting, \
@ -254,8 +258,8 @@ mixer_selections_action_new ( @@ -254,8 +258,8 @@ mixer_selections_action_new (
ms, port_connections_mgr, error) \
mixer_selections_action_new ( \
ms, port_connections_mgr, \
MIXER_SELECTIONS_ACTION_DELETE, 0, 0, 0, NULL, \
0, error)
MIXER_SELECTIONS_ACTION_DELETE, 0, 0, 0, \
NULL, 0, error)
NONNULL
MixerSelectionsAction *
@ -268,15 +272,15 @@ mixer_selections_action_perform ( @@ -268,15 +272,15 @@ mixer_selections_action_perform (
const PortConnectionsManager * connections_mgr,
MixerSelectionsActionType type,
PluginSlotType slot_type,
unsigned int to_track_name_hash,
int to_slot,
PluginSetting * setting,
int num_plugins,
GError ** error);
unsigned int to_track_name_hash,
int to_slot,
PluginSetting * setting,
int num_plugins,
GError ** error);
#define mixer_selections_action_perform_create( \
slot_type, to_tr, to_slot, setting, num_plugins, \
error) \
slot_type, to_tr, to_slot, setting, \
num_plugins, error) \
mixer_selections_action_perform ( \
NULL, NULL, MIXER_SELECTIONS_ACTION_CREATE, \
slot_type, to_tr, to_slot, setting, \
@ -310,8 +314,8 @@ mixer_selections_action_perform ( @@ -310,8 +314,8 @@ mixer_selections_action_perform (
ms, port_connections_mgr, error) \
mixer_selections_action_perform ( \
ms, port_connections_mgr, \
MIXER_SELECTIONS_ACTION_DELETE, 0, 0, 0, NULL, \
0, error)
MIXER_SELECTIONS_ACTION_DELETE, 0, 0, 0, \
NULL, 0, error)
int
mixer_selections_action_do (

7
inc/actions/port_action.h

@ -37,7 +37,8 @@ typedef enum PortActionType @@ -37,7 +37,8 @@ typedef enum PortActionType
static const cyaml_strval_t
port_action_type_strings[] = {
{"Set control val", PORT_ACTION_SET_CONTROL_VAL},
{"Set control val",
PORT_ACTION_SET_CONTROL_VAL},
};
typedef struct PortAction
@ -127,7 +128,9 @@ int @@ -127,7 +128,9 @@ int
port_action_do (PortAction * self, GError ** error);
int
port_action_undo (PortAction * self, GError ** error);
port_action_undo (
PortAction * self,
GError ** error);
char *
port_action_stringize (PortAction * self);

8
inc/actions/port_connection_action.h

@ -109,8 +109,8 @@ port_connection_action_new ( @@ -109,8 +109,8 @@ port_connection_action_new (
#define port_connection_action_new_connect( \
src_id, dest_id, error) \
port_connection_action_new ( \
PORT_CONNECTION_CONNECT, src_id, dest_id, 0.f, \
error)
PORT_CONNECTION_CONNECT, src_id, dest_id, \
0.f, error)
#define port_connection_action_new_disconnect( \
src_id, dest_id, error) \
@ -148,8 +148,8 @@ port_connection_action_perform ( @@ -148,8 +148,8 @@ port_connection_action_perform (
#define port_connection_action_perform_connect( \
src_id, dest_id, error) \
port_connection_action_perform ( \
PORT_CONNECTION_CONNECT, src_id, dest_id, 0.f, \
error)
PORT_CONNECTION_CONNECT, src_id, dest_id, \
0.f, error)
#define port_connection_action_perform_disconnect( \
src_id, dest_id, error) \

92
inc/actions/range_action.h

@ -71,46 +71,48 @@ typedef struct RangeAction @@ -71,46 +71,48 @@ typedef struct RangeAction
} RangeAction;
static const cyaml_schema_field_t range_action_fields_schema[] = {
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
parent_instance,
undoable_action_fields_schema),
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
start_pos,
position_fields_schema),
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
end_pos,
position_fields_schema),
YAML_FIELD_ENUM (
RangeAction,
type,
range_action_type_strings),
YAML_FIELD_MAPPING_PTR (
RangeAction,
sel_before,
timeline_selections_fields_schema),
YAML_FIELD_MAPPING_PTR (
RangeAction,
sel_after,
timeline_selections_fields_schema),
YAML_FIELD_INT (RangeAction, first_run),
YAML_FIELD_MAPPING_PTR (
RangeAction,
transport,
transport_fields_schema),
CYAML_FIELD_END
};
static const cyaml_schema_value_t range_action_schema = {
CYAML_VALUE_MAPPING (
CYAML_FLAG_POINTER,
RangeAction,
range_action_fields_schema),
};
static const cyaml_schema_field_t
range_action_fields_schema[] = {
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
parent_instance,
undoable_action_fields_schema),
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
start_pos,
position_fields_schema),
YAML_FIELD_MAPPING_EMBEDDED (
RangeAction,
end_pos,
position_fields_schema),
YAML_FIELD_ENUM (
RangeAction,
type,
range_action_type_strings),
YAML_FIELD_MAPPING_PTR (
RangeAction,
sel_before,
timeline_selections_fields_schema),
YAML_FIELD_MAPPING_PTR (
RangeAction,
sel_after,
timeline_selections_fields_schema),
YAML_FIELD_INT (RangeAction, first_run),
YAML_FIELD_MAPPING_PTR (
RangeAction,
transport,
transport_fields_schema),
CYAML_FIELD_END
};
static const cyaml_schema_value_t
range_action_schema = {
CYAML_VALUE_MAPPING (
CYAML_FLAG_POINTER,
RangeAction,
range_action_fields_schema),
};
void
range_action_init_loaded (RangeAction * self);
@ -132,7 +134,8 @@ range_action_new ( @@ -132,7 +134,8 @@ range_action_new (
#define range_action_new_insert_silence( \
start, end, error) \
range_action_new ( \
RANGE_ACTION_INSERT_SILENCE, start, end, error)
RANGE_ACTION_INSERT_SILENCE, start, end, \
error)
#define range_action_new_remove(start, end, error) \
range_action_new ( \
@ -152,7 +155,8 @@ range_action_perform ( @@ -152,7 +155,8 @@ range_action_perform (
#define range_action_perform_insert_silence( \
start, end, error) \
range_action_perform ( \
RANGE_ACTION_INSERT_SILENCE, start, end, error)
RANGE_ACTION_INSERT_SILENCE, start, end, \
error)
#define range_action_perform_remove( \
start, end, error) \
@ -160,7 +164,9 @@ range_action_perform ( @@ -160,7 +164,9 @@ range_action_perform (
RANGE_ACTION_REMOVE, start, end, error)
int
range_action_do (RangeAction * self, GError ** error);
range_action_do (
RangeAction * self,
GError ** error);
int
range_action_undo (

190
inc/actions/tracklist_selections.h

@ -281,12 +281,18 @@ static const cyaml_schema_field_t tracklist_selections_action_fields_schema[] = @@ -281,12 +281,18 @@ static const cyaml_schema_field_t tracklist_selections_action_fields_schema[] =
TracklistSelectionsAction,
pl_setting,
plugin_setting_fields_schema),
YAML_FIELD_INT (TracklistSelectionsAction, is_empty),
YAML_FIELD_INT (
TracklistSelectionsAction,
is_empty),
YAML_FIELD_INT (
TracklistSelectionsAction,
track_pos),
YAML_FIELD_INT (TracklistSelectionsAction, lane_pos),
YAML_FIELD_INT (TracklistSelectionsAction, have_pos),
YAML_FIELD_INT (
TracklistSelectionsAction,
lane_pos),
YAML_FIELD_INT (
TracklistSelectionsAction,
have_pos),
YAML_FIELD_MAPPING_EMBEDDED (
TracklistSelectionsAction,
pos,
@ -450,8 +456,8 @@ tracklist_selections_action_new ( @@ -450,8 +456,8 @@ tracklist_selections_action_new (
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_CREATE, NULL, \
NULL, NULL, NULL, track_type, pl_setting, \
file_descr, track_pos, -1, pos, num_tracks, 0, \
disable_track_pos, NULL, 0.f, 0.f, NULL, \
file_descr, track_pos, -1, pos, num_tracks, \
0, disable_track_pos, NULL, 0.f, 0.f, NULL, \
false, err)
/**
@ -491,8 +497,8 @@ tracklist_selections_action_new ( @@ -491,8 +497,8 @@ tracklist_selections_action_new (
#define tracklist_selections_action_new_create_audio_group( \
track_pos, num_tracks, err) \
tracklist_selections_action_new_create ( \
TRACK_TYPE_AUDIO_GROUP, NULL, NULL, track_pos, \
NULL, num_tracks, -1, err)
TRACK_TYPE_AUDIO_GROUP, NULL, NULL, \
track_pos, NULL, num_tracks, -1, err)
/**
* Creates a new TracklistSelectionsAction for a
@ -528,7 +534,8 @@ tracklist_selections_action_new ( @@ -528,7 +534,8 @@ tracklist_selections_action_new (
* Generic edit action.
*/
#define tracklist_selections_action_new_edit_generic( \
type, tls_before, tls_after, already_edited, err) \
type, tls_before, tls_after, already_edited, \
err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
tls_after, NULL, NULL, 0, NULL, NULL, -1, -1, \
@ -566,9 +573,9 @@ tracklist_selections_action_new ( @@ -566,9 +573,9 @@ tracklist_selections_action_new (
tls_before, mute_new, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_MUTE, mute_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_MUTE, \
mute_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_edit_mute_lane( \
track_lane, mute_new, err) \
@ -583,9 +590,9 @@ tracklist_selections_action_new ( @@ -583,9 +590,9 @@ tracklist_selections_action_new (
tls_before, solo_new, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_SOLO, solo_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_SOLO, \
solo_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_edit_solo_lane( \
track_lane, solo_new, err) \
@ -600,32 +607,32 @@ tracklist_selections_action_new ( @@ -600,32 +607,32 @@ tracklist_selections_action_new (
tls_before, solo_new, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_LISTEN, solo_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_LISTEN, \
solo_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_edit_enable( \
tls_before, enable_new, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_ENABLE, enable_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_ENABLE, \
enable_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_edit_fold( \
tls_before, fold_new, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_FOLD, fold_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_FOLD, \
fold_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_edit_direct_out( \
tls, port_connections_mgr, direct_out, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, \
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_DIRECT_OUT, \
(direct_out)->pos, NULL, 0.f, 0.f, NULL, \
false, err)
@ -634,8 +641,8 @@ tracklist_selections_action_new ( @@ -634,8 +641,8 @@ tracklist_selections_action_new (
tls, port_connections_mgr, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, \
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_DIRECT_OUT, -1, NULL, \
0.f, 0.f, NULL, false, err)
@ -652,8 +659,8 @@ tracklist_selections_action_new ( @@ -652,8 +659,8 @@ tracklist_selections_action_new (
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
NULL, NULL, 0, NULL, NULL, -1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_ICON, false, NULL, 0.f, \
0.f, icon, false, err)
EDIT_TRACK_ACTION_TYPE_ICON, false, NULL, \
0.f, 0.f, icon, false, err)
#define tracklist_selections_action_new_edit_comment( \
tls, comment, err) \
@ -667,9 +674,10 @@ tracklist_selections_action_new ( @@ -667,9 +674,10 @@ tracklist_selections_action_new (
track, port_connections_mgr, name, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, NULL, NULL, \
port_connections_mgr, track, 0, NULL, NULL, -1, \
-1, NULL, -1, EDIT_TRACK_ACTION_TYPE_RENAME, \
false, NULL, 0.f, 0.f, name, false, err)
port_connections_mgr, track, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_RENAME, false, NULL, \
0.f, 0.f, name, false, err)
#define tracklist_selections_action_new_edit_rename_lane( \
track_lane, name, err) \
@ -695,8 +703,9 @@ tracklist_selections_action_new ( @@ -695,8 +703,9 @@ tracklist_selections_action_new (
tls, port_connections_mgr, track_pos, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_MOVE, tls, NULL, \
NULL, NULL, 0, NULL, NULL, track_pos, -1, NULL, \
-1, 0, false, NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, 0, NULL, NULL, track_pos, -1, \
NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
#define tracklist_selections_action_new_copy( \
tls, port_connections_mgr, track_pos, err) \
@ -732,16 +741,16 @@ tracklist_selections_action_new ( @@ -732,16 +741,16 @@ tracklist_selections_action_new (
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_COPY_INSIDE, tls, \
NULL, port_connections_mgr, NULL, 0, NULL, \
NULL, track_pos, -1, NULL, -1, 0, false, NULL, \
0.f, 0.f, NULL, false, err)
NULL, track_pos, -1, NULL, -1, 0, false, \
NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_new_delete( \
tls, port_connections_mgr, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_DELETE, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
TRACKLIST_SELECTIONS_ACTION_DELETE, tls, \
NULL, port_connections_mgr, NULL, 0, NULL, \
NULL, -1, -1, NULL, -1, 0, false, NULL, 0.f, \
0.f, NULL, false, err)
/**
* Toggle the current pin status of the track.
@ -750,9 +759,9 @@ tracklist_selections_action_new ( @@ -750,9 +759,9 @@ tracklist_selections_action_new (
tls, port_connections_mgr, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_PIN, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, 0, false, NULL, 0.f, 0.f, \
NULL, false, err)
/**
* Toggle the current pin status of the track.
@ -761,9 +770,9 @@ tracklist_selections_action_new ( @@ -761,9 +770,9 @@ tracklist_selections_action_new (
tls, port_connections_mgr, err) \
tracklist_selections_action_new ( \
TRACKLIST_SELECTIONS_ACTION_UNPIN, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, 0, false, NULL, 0.f, 0.f, \
NULL, false, err)
NONNULL
TracklistSelectionsAction *
@ -803,8 +812,8 @@ tracklist_selections_action_perform ( @@ -803,8 +812,8 @@ tracklist_selections_action_perform (
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_CREATE, NULL, \
NULL, NULL, NULL, track_type, pl_setting, \
file_descr, track_pos, -1, pos, num_tracks, 0, \
disable_track_pos, NULL, 0.f, 0.f, NULL, \
file_descr, track_pos, -1, pos, num_tracks, \
0, disable_track_pos, NULL, 0.f, 0.f, NULL, \
false, err)
/**
@ -844,8 +853,8 @@ tracklist_selections_action_perform ( @@ -844,8 +853,8 @@ tracklist_selections_action_perform (
#define tracklist_selections_action_perform_create_audio_group( \
track_pos, num_tracks, err) \
tracklist_selections_action_perform_create ( \
TRACK_TYPE_AUDIO_GROUP, NULL, NULL, track_pos, \
NULL, num_tracks, -1, err)
TRACK_TYPE_AUDIO_GROUP, NULL, NULL, \
track_pos, NULL, num_tracks, -1, err)
/**
* Creates a perform TracklistSelectionsAction for a
@ -881,7 +890,8 @@ tracklist_selections_action_perform ( @@ -881,7 +890,8 @@ tracklist_selections_action_perform (
* Generic edit action.
*/
#define tracklist_selections_action_perform_edit_generic( \
type, tls_before, tls_after, already_edited, err) \
type, tls_before, tls_after, already_edited, \
err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
tls_after, NULL, NULL, 0, NULL, NULL, -1, -1, \
@ -919,9 +929,9 @@ tracklist_selections_action_perform ( @@ -919,9 +929,9 @@ tracklist_selections_action_perform (
tls_before, mute_new, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_MUTE, mute_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_MUTE, \
mute_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_edit_mute_lane( \
track_lane, mute_new, err) \
@ -936,9 +946,9 @@ tracklist_selections_action_perform ( @@ -936,9 +946,9 @@ tracklist_selections_action_perform (
tls_before, solo_new, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_SOLO, solo_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_SOLO, \
solo_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_edit_solo_lane( \
track_lane, solo_new, err) \
@ -953,32 +963,32 @@ tracklist_selections_action_perform ( @@ -953,32 +963,32 @@ tracklist_selections_action_perform (
tls_before, solo_new, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_LISTEN, solo_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_LISTEN, \
solo_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_edit_enable( \
tls_before, enable_new, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_ENABLE, enable_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_ENABLE, \
enable_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_edit_fold( \
tls_before, fold_new, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls_before, \
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, NULL, \
-1, EDIT_TRACK_ACTION_TYPE_FOLD, fold_new, \
NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, NULL, 0, NULL, NULL, -1, -1, \
NULL, -1, EDIT_TRACK_ACTION_TYPE_FOLD, \
fold_new, NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_edit_direct_out( \
tls, port_connections_mgr, direct_out, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, \
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_DIRECT_OUT, \
(direct_out)->pos, NULL, 0.f, 0.f, NULL, \
false, err)
@ -987,8 +997,8 @@ tracklist_selections_action_perform ( @@ -987,8 +997,8 @@ tracklist_selections_action_perform (
tls, port_connections_mgr, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, \
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_DIRECT_OUT, -1, NULL, \
0.f, 0.f, NULL, false, err)
@ -1005,8 +1015,8 @@ tracklist_selections_action_perform ( @@ -1005,8 +1015,8 @@ tracklist_selections_action_perform (
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, tls, NULL, \
NULL, NULL, 0, NULL, NULL, -1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_ICON, false, NULL, 0.f, \
0.f, icon, false, err)
EDIT_TRACK_ACTION_TYPE_ICON, false, NULL, \
0.f, 0.f, icon, false, err)
#define tracklist_selections_action_perform_edit_comment( \
tls, comment, err) \
@ -1020,9 +1030,10 @@ tracklist_selections_action_perform ( @@ -1020,9 +1030,10 @@ tracklist_selections_action_perform (
track, port_connections_mgr, name, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_EDIT, NULL, NULL, \
port_connections_mgr, track, 0, NULL, NULL, -1, \
-1, NULL, -1, EDIT_TRACK_ACTION_TYPE_RENAME, \
false, NULL, 0.f, 0.f, name, false, err)
port_connections_mgr, track, 0, NULL, NULL, \
-1, -1, NULL, -1, \
EDIT_TRACK_ACTION_TYPE_RENAME, false, NULL, \
0.f, 0.f, name, false, err)
#define tracklist_selections_action_perform_edit_rename_lane( \
track_lane, name, err) \
@ -1048,8 +1059,9 @@ tracklist_selections_action_perform ( @@ -1048,8 +1059,9 @@ tracklist_selections_action_perform (
tls, port_connections_mgr, track_pos, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_MOVE, tls, NULL, \
NULL, NULL, 0, NULL, NULL, track_pos, -1, NULL, \
-1, 0, false, NULL, 0.f, 0.f, NULL, false, err)
NULL, NULL, 0, NULL, NULL, track_pos, -1, \
NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
#define tracklist_selections_action_perform_copy( \
tls, port_connections_mgr, track_pos, err) \
@ -1085,16 +1097,16 @@ tracklist_selections_action_perform ( @@ -1085,16 +1097,16 @@ tracklist_selections_action_perform (
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_COPY_INSIDE, tls, \
NULL, port_connections_mgr, NULL, 0, NULL, \
NULL, track_pos, -1, NULL, -1, 0, false, NULL, \
0.f, 0.f, NULL, false, err)
NULL, track_pos, -1, NULL, -1, 0, false, \
NULL, 0.f, 0.f, NULL, false, err)
#define tracklist_selections_action_perform_delete( \
tls, port_connections_mgr, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_DELETE, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
TRACKLIST_SELECTIONS_ACTION_DELETE, tls, \
NULL, port_connections_mgr, NULL, 0, NULL, \
NULL, -1, -1, NULL, -1, 0, false, NULL, 0.f, \
0.f, NULL, false, err)
/**
* Toggle the current pin status of the track.
@ -1103,9 +1115,9 @@ tracklist_selections_action_perform ( @@ -1103,9 +1115,9 @@ tracklist_selections_action_perform (
tls, port_connections_mgr, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_PIN, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, 0, false, NULL, 0.f, 0.f, \
NULL, false, err)
/**
* Toggle the current pin status of the track.
@ -1114,9 +1126,9 @@ tracklist_selections_action_perform ( @@ -1114,9 +1126,9 @@ tracklist_selections_action_perform (
tls, port_connections_mgr, err) \
tracklist_selections_action_perform ( \
TRACKLIST_SELECTIONS_ACTION_UNPIN, tls, NULL, \
port_connections_mgr, NULL, 0, NULL, NULL, -1, \
-1, NULL, -1, 0, false, NULL, 0.f, 0.f, NULL, \
false, err)
port_connections_mgr, NULL, 0, NULL, NULL, \
-1, -1, NULL, -1, 0, false, NULL, 0.f, 0.f, \
NULL, false, err)
/**
* Edit or remove direct out.

3
inc/actions/transport_action.h

@ -128,7 +128,8 @@ transport_action_new_time_sig_change ( @@ -128,7 +128,8 @@ transport_action_new_time_sig_change (
NONNULL
TransportAction *
transport_action_clone (const TransportAction * src);
transport_action_clone (
const TransportAction * src);
bool
transport_action_perform_bpm_change (

14
inc/actions/undo_manager.h

@ -79,11 +79,12 @@ static const cyaml_schema_field_t @@ -79,11 +79,12 @@ static const cyaml_schema_field_t
CYAML_FIELD_END
};
static const cyaml_schema_value_t undo_manager_schema = {
YAML_VALUE_PTR (
UndoManager,
undo_manager_fields_schema),
};
static const cyaml_schema_value_t
undo_manager_schema = {
YAML_VALUE_PTR (
UndoManager,
undo_manager_fields_schema),
};
/**
* Inits the undo manager by populating the
@ -140,7 +141,8 @@ undo_manager_perform ( @@ -140,7 +141,8 @@ undo_manager_perform (
action, err, ...) \
{ \
g_return_val_if_fail ( \
router_is_processing_thread (ROUTER) == false, \
router_is_processing_thread (ROUTER) \
== false, \
false); \
UndoableAction * ua = action (__VA_ARGS__); \
if (ua) \

10
inc/actions/undo_stack.h

@ -158,7 +158,9 @@ static const cyaml_schema_field_t undo_stack_fields_schema[] = { @@ -158,7 +158,9 @@ static const cyaml_schema_field_t undo_stack_fields_schema[] = {
};
static const cyaml_schema_value_t undo_stack_schema = {
YAML_VALUE_PTR (UndoStack, undo_stack_fields_schema),
YAML_VALUE_PTR (
UndoStack,
undo_stack_fields_schema),
};
void
@ -194,7 +196,8 @@ undo_stack_get_total_cached_actions ( @@ -194,7 +196,8 @@ undo_stack_get_total_cached_actions (
/* --- start wrappers --- */
#define undo_stack_size(x) (stack_size ((x)->stack))
#define undo_stack_size(x) \
(stack_size ((x)->stack))
#define undo_stack_is_empty(x) \
(stack_is_empty ((x)->stack))
@ -202,7 +205,8 @@ undo_stack_get_total_cached_actions ( @@ -202,7 +205,8 @@ undo_stack_get_total_cached_actions (
#define undo_stack_is_full(x) \
(stack_is_full ((x)->stack))
#define undo_stack_peek(x) (stack_peek ((x)->stack))
#define undo_stack_peek(x) \
(stack_peek ((x)->stack))
#define undo_stack_peek_last(x) \
(stack_peek_last ((x)->stack))

2
inc/audio/audio_region.h

@ -156,7 +156,7 @@ HOT NONNULL void @@ -156,7 +156,7 @@ HOT NONNULL void
audio_region_fill_stereo_ports (
ZRegion * self,
const EngineProcessTimeInfo * const time_nfo,
StereoPorts * stereo_ports);
StereoPorts * stereo_ports);
float
audio_region_detect_bpm (

3
inc/audio/automation_point.h

@ -48,7 +48,8 @@ typedef struct _AutomationPointWidget @@ -48,7 +48,8 @@ typedef struct _AutomationPointWidget
#define AP_WIDGET_POINT_SIZE 6
#define automation_point_is_selected(r) \
arranger_object_is_selected ((ArrangerObject *) r)
arranger_object_is_selected ( \
(ArrangerObject *) r)
/**
* Used for caching.

14
inc/audio/automation_track.h

@ -50,11 +50,12 @@ typedef enum AutomationMode @@ -50,11 +50,12 @@ typedef enum AutomationMode
NUM_AUTOMATION_MODES,
} AutomationMode;
static const cyaml_strval_t automation_mode_strings[] = {
{"Read", AUTOMATION_MODE_READ },
{ "Rec", AUTOMATION_MODE_RECORD},
{ "Off", AUTOMATION_MODE_OFF },
{ "<invalid>", NUM_AUTOMATION_MODES },
static const cyaml_strval_t
automation_mode_strings[] = {
{"Read", AUTOMATION_MODE_READ },
{ "Rec", AUTOMATION_MODE_RECORD},
{ "Off", AUTOMATION_MODE_OFF },
{ "<invalid>", NUM_AUTOMATION_MODES },
};
typedef enum AutomationRecordMode
@ -494,7 +495,8 @@ automation_track_get_last_region ( @@ -494,7 +495,8 @@ automation_track_get_last_region (
NONNULL
void
automation_track_set_caches (AutomationTrack * self);
automation_track_set_caches (
AutomationTrack * self);
NONNULL
bool

78
inc/audio/channel_send.h

@ -128,44 +128,46 @@ typedef struct ChannelSend @@ -128,44 +128,46 @@ typedef struct ChannelSend
} ChannelSend;
static const cyaml_schema_field_t channel_send_fields_schema[] = {
YAML_FIELD_INT (ChannelSend, schema_version),
YAML_FIELD_INT (ChannelSend, slot),
YAML_FIELD_MAPPING_PTR (
ChannelSend,
amount,
port_fields_schema),
YAML_FIELD_MAPPING_PTR (
ChannelSend,
enabled,
port_fields_schema),
YAML_FIELD_INT (ChannelSend, is_sidechain),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
midi_in,
port_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
stereo_in,
stereo_ports_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
midi_out,
port_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
stereo_out,
stereo_ports_fields_schema),
YAML_FIELD_UINT (ChannelSend, track_name_hash),
CYAML_FIELD_END
};
static const cyaml_schema_value_t channel_send_schema = {
YAML_VALUE_PTR (
ChannelSend,
channel_send_fields_schema),
};
static const cyaml_schema_field_t
channel_send_fields_schema[] = {
YAML_FIELD_INT (ChannelSend, schema_version),
YAML_FIELD_INT (ChannelSend, slot),
YAML_FIELD_MAPPING_PTR (
ChannelSend,
amount,
port_fields_schema),
YAML_FIELD_MAPPING_PTR (
ChannelSend,
enabled,
port_fields_schema),
YAML_FIELD_INT (ChannelSend, is_sidechain),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
midi_in,
port_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
stereo_in,
stereo_ports_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
midi_out,
port_fields_schema),
YAML_FIELD_MAPPING_PTR_OPTIONAL (
ChannelSend,
stereo_out,
stereo_ports_fields_schema),
YAML_FIELD_UINT (ChannelSend, track_name_hash),
CYAML_FIELD_END
};
static const cyaml_schema_value_t
channel_send_schema = {
YAML_VALUE_PTR (
ChannelSend,
channel_send_fields_schema),
};
NONNULL_ARGS (1)
void

3
inc/audio/chord_descriptor.h

@ -330,7 +330,8 @@ chord_descriptor_is_key_bass ( @@ -330,7 +330,8 @@ chord_descriptor_is_key_bass (
* Clones the given ChordDescriptor.
*/
ChordDescriptor *
chord_descriptor_clone (const ChordDescriptor * src);
chord_descriptor_clone (
const ChordDescriptor * src);
void
chord_descriptor_copy (

17
inc/audio/chord_object.h

@ -44,14 +44,16 @@ @@ -44,14 +44,16 @@
#define CHORD_OBJECT_MAGIC 4181694
#define IS_CHORD_OBJECT(x) \
(((ChordObject *) x)->magic == CHORD_OBJECT_MAGIC)
(((ChordObject *) x)->magic \
== CHORD_OBJECT_MAGIC)
#define IS_CHORD_OBJECT_AND_NONNULL(x) \
(x && IS_CHORD_OBJECT (x))
#define CHORD_OBJECT_WIDGET_TRIANGLE_W 10
#define chord_object_is_selected(r) \
arranger_object_is_selected ((ArrangerObject *) r)
arranger_object_is_selected ( \
(ArrangerObject *) r)
typedef struct ChordDescriptor ChordDescriptor;
@ -92,11 +94,12 @@ static const cyaml_schema_field_t @@ -92,11 +94,12 @@ static const cyaml_schema_field_t
CYAML_FIELD_END
};
static const cyaml_schema_value_t chord_object_schema = {
YAML_VALUE_PTR (
ChordObject,
chord_object_fields_schema),
};
static const cyaml_schema_value_t
chord_object_schema = {
YAML_VALUE_PTR (
ChordObject,
chord_object_fields_schema),
};
/**
* Creates a ChordObject.

11
inc/audio/control_room.h

@ -108,11 +108,12 @@ static const cyaml_schema_field_t @@ -108,11 +108,12 @@ static const cyaml_schema_field_t
CYAML_FIELD_END
};
static const cyaml_schema_value_t control_room_schema = {
YAML_VALUE_PTR (
ControlRoom,
control_room_fields_schema),
};
static const cyaml_schema_value_t
control_room_schema = {
YAML_VALUE_PTR (
ControlRoom,
control_room_fields_schema),
};
/**
* Inits the control room from a project.

11
inc/audio/curve.h

@ -108,12 +108,13 @@ typedef enum CurveAlgorithm @@ -108,12 +108,13 @@ typedef enum CurveAlgorithm
} CurveAlgorithm;
static const cyaml_strval_t curve_algorithm_strings[] = {
{__ ("Exponent"), CURVE_ALGORITHM_EXPONENT },
{__ ("Exponent"), CURVE_ALGORITHM_EXPONENT},
{ __ ("Superellipse"),
CURVE_ALGORITHM_SUPERELLIPSE },
{ __ ("Vital"), CURVE_ALGORITHM_VITAL },
{ __ ("Pulse"), CURVE_ALGORITHM_PULSE },
{ __ ("Logarithmic"), CURVE_ALGORITHM_LOGARITHMIC},
CURVE_ALGORITHM_SUPERELLIPSE },
{ __ ("Vital"), CURVE_ALGORITHM_VITAL },
{ __ ("Pulse"), CURVE_ALGORITHM_PULSE },
{ __ ("Logarithmic"),
CURVE_ALGORITHM_LOGARITHMIC },
};
/**

27
inc/audio/engine.h

@ -143,7 +143,8 @@ typedef struct MPMCQueue MPMCQueue; @@ -143,7 +143,8 @@ typedef struct MPMCQueue MPMCQueue;
_ev->backtrace = \
backtrace_get ("", 40, false); \
g_debug ( \
"pushing engine event " #et " (%s:%d)", \
"pushing engine event " #et \
" (%s:%d)", \
__func__, __LINE__); \
} \
engine_queue_push_back_event ( \
@ -274,14 +275,22 @@ audio_backend_is_rtaudio (AudioBackend backend) @@ -274,14 +275,22 @@ audio_backend_is_rtaudio (AudioBackend backend)
__attribute__ ((
unused)) static const char * audio_backend_str[] = {
/* TRANSLATORS: Dummy backend */
__ ("Dummy"), __ ("Dummy (libsoundio)"),
"ALSA (not working)", "ALSA (libsoundio)",
"ALSA (rtaudio)", "JACK",
"JACK (libsoundio)", "JACK (rtaudio)",
"PulseAudio", "PulseAudio (libsoundio)",
"PulseAudio (rtaudio)", "CoreAudio (libsoundio)",
"CoreAudio (rtaudio)", "SDL",
"WASAPI (libsoundio)", "WASAPI (rtaudio)",
__ ("Dummy"),
__ ("Dummy (libsoundio)"),
"ALSA (not working)",
"ALSA (libsoundio)",
"ALSA (rtaudio)",
"JACK",
"JACK (libsoundio)",
"JACK (rtaudio)",
"PulseAudio",
"PulseAudio (libsoundio)",
"PulseAudio (rtaudio)",
"CoreAudio (libsoundio)",
"CoreAudio (rtaudio)",
"SDL",
"WASAPI (libsoundio)",
"WASAPI (rtaudio)",
"ASIO (rtaudio)",
};

3
inc/audio/exporter.h

@ -204,7 +204,8 @@ void @@ -204,7 +204,8 @@ void
export_settings_print (const ExportSettings * self);
void
export_settings_free_members (ExportSettings * self);
export_settings_free_members (