mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent warnings

Browse Source
This commit is contained in:
twinaphex 2020-02-10 11:54:05 +01:00
parent 0c6bb6660a
commit 9dbad614a5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -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 */

14
configuration.c
View File

@ -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 */

4
menu/menu_setting.c
View File

@ -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,