From de8f5fe101607c2100b7dee523b1e098f7b0b2cc Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 14 Dec 2022 22:55:26 +0100 Subject: [PATCH] i like data types separated from functions --- src/ged.h | 45 +++++++++++++++++++++++---------------------- src/osc_out.h | 20 ++++++++++---------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/ged.h b/src/ged.h index c63bbfb..0de4b8b 100644 --- a/src/ged.h +++ b/src/ged.h @@ -62,24 +62,6 @@ typedef struct { bool is_hud_visible : 1; } Ged; -void ged_init(Ged *a, Usz undo_limit, Usz init_bpm, Usz init_seed); - -void ged_make_cursor_visible(Ged *a); - -void ged_send_osc_bpm(Ged *a, I32 bpm); - -void ged_set_playing(Ged *a, bool playing); - -void ged_do_stuff(Ged *a); - -bool ged_is_draw_dirty(Ged *a); - -void ged_draw(Ged *a, WINDOW *win, char const *filename, bool use_fancy_dots, bool use_fancy_rulers); - -double ged_secs_to_deadline(Ged const *a); - -ORCA_OK_IF_UNUSED void ged_mouse_event(Ged *a, Usz vis_y, Usz vis_x, mmask_t mouse_bstate); - typedef enum { Ged_dir_up, @@ -88,10 +70,6 @@ typedef enum Ged_dir_right, } Ged_dir; -void ged_dir_input(Ged *a, Ged_dir dir, int step_length); - -void ged_input_character(Ged *a, char c); - typedef enum { Ged_input_cmd_undo, @@ -108,6 +86,29 @@ typedef enum } Ged_input_cmd; +void ged_init(Ged *a, Usz undo_limit, Usz init_bpm, Usz init_seed); + +void ged_make_cursor_visible(Ged *a); + +void ged_send_osc_bpm(Ged *a, I32 bpm); + +void ged_set_playing(Ged *a, bool playing); + +void ged_do_stuff(Ged *a); + +bool ged_is_draw_dirty(Ged *a); + +void ged_draw(Ged *a, WINDOW *win, char const *filename, bool use_fancy_dots, bool use_fancy_rulers); + +double ged_secs_to_deadline(Ged const *a); + +ORCA_OK_IF_UNUSED void ged_mouse_event(Ged *a, Usz vis_y, Usz vis_x, mmask_t mouse_bstate); + + +void ged_dir_input(Ged *a, Ged_dir dir, int step_length); + +void ged_input_character(Ged *a, char c); + void ged_set_window_size(Ged *a, int win_h, int win_w, int softmargin_y, int softmargin_x); void ged_resize_grid( diff --git a/src/osc_out.h b/src/osc_out.h index 6481ceb..9a24162 100644 --- a/src/osc_out.h +++ b/src/osc_out.h @@ -10,16 +10,6 @@ typedef enum Oosc_udp_create_error_couldnt_open_socket = 2, } Oosc_udp_create_error; -Oosc_udp_create_error oosc_dev_create_udp(Oosc_dev **out_ptr, char const *dest_addr, char const *dest_port); -void oosc_dev_destroy(Oosc_dev *dev); - -// Send a raw UDP datagram. -void oosc_send_datagram(Oosc_dev *dev, char const *data, Usz size); - -// Send a list/array of 32-bit integers in OSC format to the specified "osc -// address" (a path like /foo) as a UDP datagram. -void oosc_send_int32s(Oosc_dev *dev, char const *osc_address, I32 const *vals, Usz count); - // Susnote is for handling MIDI note sustains -- each MIDI on event should be // matched with a MIDI note-off event. The duration/sustain length of a MIDI // note is specified when it is first triggered, so the orca VM itself is not @@ -35,6 +25,16 @@ typedef struct { Usz count, capacity; } Susnote_list; +Oosc_udp_create_error oosc_dev_create_udp(Oosc_dev **out_ptr, char const *dest_addr, char const *dest_port); +void oosc_dev_destroy(Oosc_dev *dev); + +// Send a raw UDP datagram. +void oosc_send_datagram(Oosc_dev *dev, char const *data, Usz size); + +// Send a list/array of 32-bit integers in OSC format to the specified "osc +// address" (a path like /foo) as a UDP datagram. +void oosc_send_int32s(Oosc_dev *dev, char const *osc_address, I32 const *vals, Usz count); + void susnote_list_init(Susnote_list *sl); void susnote_list_deinit(Susnote_list *sl); void susnote_list_clear(Susnote_list *sl);