diff --git a/config.def.h b/config.def.h index 79ef068d47..5e27d5e224 100644 --- a/config.def.h +++ b/config.def.h @@ -1072,8 +1072,10 @@ static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QU #endif /* MIDI */ -static const char *midi_input = "Off"; -static const char *midi_output = "Off"; +#define DEFAULT_MIDI_INPUT "Off" + +#define DEFAULT_MIDI_OUTPUT "Off" + static const unsigned midi_volume = 100; /* Only applies to Android 7.0 (API 24) and up */ diff --git a/configuration.c b/configuration.c index 6a466ef8df..2cf65ebbfe 100644 --- a/configuration.c +++ b/configuration.c @@ -1166,8 +1166,8 @@ static struct config_array_setting *populate_settings_array(settings_t *settings SETTING_ARRAY("led_driver", settings->arrays.led_driver, false, NULL, true); SETTING_ARRAY("netplay_mitm_server", settings->arrays.netplay_mitm_server, false, NULL, true); SETTING_ARRAY("midi_driver", settings->arrays.midi_driver, false, NULL, true); - SETTING_ARRAY("midi_input", settings->arrays.midi_input, true, midi_input, true); - SETTING_ARRAY("midi_output", settings->arrays.midi_output, true, midi_output, true); + SETTING_ARRAY("midi_input", settings->arrays.midi_input, true, DEFAULT_MIDI_INPUT, true); + SETTING_ARRAY("midi_output", settings->arrays.midi_output, true, DEFAULT_MIDI_OUTPUT, true); SETTING_ARRAY("youtube_stream_key", settings->arrays.youtube_stream_key, true, NULL, true); SETTING_ARRAY("twitch_stream_key", settings->arrays.twitch_stream_key, true, NULL, true); SETTING_ARRAY("discord_app_id", settings->arrays.discord_app_id, true, DEFAULT_DISCORD_APP_ID, true); @@ -2420,12 +2420,10 @@ void config_set_defaults(void *data) free(temp_str); } - if (midi_input) - strlcpy(settings->arrays.midi_input, - midi_input, sizeof(settings->arrays.midi_input)); - if (midi_output) - strlcpy(settings->arrays.midi_output, - midi_output, sizeof(settings->arrays.midi_output)); + strlcpy(settings->arrays.midi_input, + DEFAULT_MIDI_INPUT, sizeof(settings->arrays.midi_input)); + strlcpy(settings->arrays.midi_output, + DEFAULT_MIDI_OUTPUT, sizeof(settings->arrays.midi_output)); #ifdef HAVE_CONFIGFILE /* Avoid reloading config on every content load */ diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 0c0354eaae..4133f24578 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -16769,7 +16769,7 @@ static bool setting_append_list( sizeof(settings->arrays.midi_input), MENU_ENUM_LABEL_MIDI_INPUT, MENU_ENUM_LABEL_VALUE_MIDI_INPUT, - midi_input, + DEFAULT_MIDI_INPUT, &group_info, &subgroup_info, parent_group, @@ -16785,7 +16785,7 @@ static bool setting_append_list( sizeof(settings->arrays.midi_output), MENU_ENUM_LABEL_MIDI_OUTPUT, MENU_ENUM_LABEL_VALUE_MIDI_OUTPUT, - midi_output, + DEFAULT_MIDI_OUTPUT, &group_info, &subgroup_info, parent_group,