From 8e937ddd6a2cff3cb0764d519f0dd9c1c62a1828 Mon Sep 17 00:00:00 2001 From: sonninnos <45124675+sonninnos@users.noreply.github.com> Date: Tue, 29 Nov 2022 12:29:39 +0200 Subject: [PATCH] MIDI driver cleanups (#14686) --- config.def.h | 4 ++-- menu/menu_setting.c | 3 +-- midi_driver.c | 34 ++++++++++++++++------------------ 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/config.def.h b/config.def.h index 0025868faa..764d8ab21c 100644 --- a/config.def.h +++ b/config.def.h @@ -1514,8 +1514,8 @@ #endif /* MIDI */ -#define DEFAULT_MIDI_INPUT "Off" -#define DEFAULT_MIDI_OUTPUT "Off" +#define DEFAULT_MIDI_INPUT "OFF" +#define DEFAULT_MIDI_OUTPUT "OFF" #define DEFAULT_MIDI_VOLUME 100 #ifdef HAVE_MIST diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 5e14e379c9..b2a1b580f8 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -8276,8 +8276,7 @@ static void general_write_handler(rarch_setting_t *setting) case MENU_ENUM_LABEL_MIDI_OUTPUT: { settings_t *settings = config_get_ptr(); - midi_driver_set_output(settings, - settings->arrays.midi_output); + midi_driver_set_output(settings, settings->arrays.midi_output); } break; case MENU_ENUM_LABEL_MIDI_VOLUME: diff --git a/midi_driver.c b/midi_driver.c index 3a93ac3978..9332d69de6 100644 --- a/midi_driver.c +++ b/midi_driver.c @@ -23,6 +23,7 @@ #include "verbosity.h" #define MIDI_DRIVER_BUF_SIZE 4096 +#define MIDI_DRIVER_OFF "OFF" static void *rarch_midi_drv_data; static struct string_list *rarch_midi_drv_inputs; @@ -239,8 +240,8 @@ bool midi_driver_init(void *data) if (!rarch_midi_drv_inputs || !rarch_midi_drv_outputs) ret = false; - else if (!string_list_append(rarch_midi_drv_inputs, "Off", attr) || - !string_list_append(rarch_midi_drv_outputs, "Off", attr)) + else if (!string_list_append(rarch_midi_drv_inputs, MIDI_DRIVER_OFF, attr) || + !string_list_append(rarch_midi_drv_outputs, MIDI_DRIVER_OFF, attr)) ret = false; else { @@ -262,7 +263,7 @@ bool midi_driver_init(void *data) ret = false; else { - if (string_is_not_equal(settings->arrays.midi_input, "Off")) + if (string_is_not_equal(settings->arrays.midi_input, MIDI_DRIVER_OFF)) { if (string_list_find_elem(rarch_midi_drv_inputs, settings->arrays.midi_input)) input = settings->arrays.midi_input; @@ -271,11 +272,11 @@ bool midi_driver_init(void *data) RARCH_WARN("[MIDI]: Input device \"%s\" unavailable.\n", settings->arrays.midi_input); configuration_set_string(settings, - settings->arrays.midi_input, "Off"); + settings->arrays.midi_input, MIDI_DRIVER_OFF); } } - if (string_is_not_equal(settings->arrays.midi_output, "Off")) + if (string_is_not_equal(settings->arrays.midi_output, MIDI_DRIVER_OFF)) { if (string_list_find_elem(rarch_midi_drv_outputs, settings->arrays.midi_output)) output = settings->arrays.midi_output; @@ -284,7 +285,7 @@ bool midi_driver_init(void *data) RARCH_WARN("[MIDI]: Output device \"%s\" unavailable.\n", settings->arrays.midi_output); configuration_set_string(settings, - settings->arrays.midi_output, "Off"); + settings->arrays.midi_output, MIDI_DRIVER_OFF); } } @@ -301,11 +302,11 @@ bool midi_driver_init(void *data) else { if (input) - RARCH_LOG("[MIDI]: Input device \"%s\".\n", input); + RARCH_LOG("[MIDI]: Input device: \"%s\".\n", input); if (output) { - RARCH_LOG("[MIDI]: Output device \"%s\".\n", output); + RARCH_LOG("[MIDI]: Output device: \"%s\".\n", output); midi_driver_set_volume(settings->uints.midi_volume); } } @@ -332,7 +333,7 @@ bool midi_driver_set_input(const char *input) return false; } - if (string_is_equal(input, "Off")) + if (string_is_equal(input, MIDI_DRIVER_OFF)) input = NULL; if (!midi_drv->set_input(rarch_midi_drv_data, input)) @@ -366,7 +367,7 @@ bool midi_driver_set_output(void *settings_data, const char *output) return false; } - if (string_is_equal(output, "Off")) + if (string_is_equal(output, MIDI_DRIVER_OFF)) output = NULL; if (!midi_drv->set_output(rarch_midi_drv_data, output)) @@ -424,8 +425,7 @@ bool midi_driver_read(uint8_t *byte) if (i == rarch_midi_drv_input_event.data_size) { rarch_midi_drv_input_event.data_size = MIDI_DRIVER_BUF_SIZE; - if (!midi_drv->read(rarch_midi_drv_data, - &rarch_midi_drv_input_event)) + if (!midi_drv->read(rarch_midi_drv_data, &rarch_midi_drv_input_event)) { rarch_midi_drv_input_event.data_size = i; return false; @@ -475,8 +475,8 @@ bool midi_driver_write(uint8_t byte, uint32_t delta_time) if (byte >= 0x80) { - if ( rarch_midi_drv_output_event.data_size && - rarch_midi_drv_output_event.data[0] == 0xF0) + if ( rarch_midi_drv_output_event.data_size + && rarch_midi_drv_output_event.data[0] == 0xF0) { if (byte == 0xF7) event_size = (int)rarch_midi_drv_output_event.data_size + 1; @@ -542,8 +542,7 @@ bool midi_driver_write(uint8_t byte, uint32_t delta_time) if (rarch_midi_drv_output_event.data_size == event_size) { - if (!midi_drv->write(rarch_midi_drv_data, - &rarch_midi_drv_output_event)) + if (!midi_drv->write(rarch_midi_drv_data, &rarch_midi_drv_output_event)) return false; #ifdef DEBUG @@ -586,8 +585,7 @@ bool midi_driver_flush(void) return false; if (rarch_midi_drv_output_pending) - rarch_midi_drv_output_pending = - !midi_drv->flush(rarch_midi_drv_data); + rarch_midi_drv_output_pending = !midi_drv->flush(rarch_midi_drv_data); return !rarch_midi_drv_output_pending; }