libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-20 01:22:16 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Less passing around of settings_t pointer
Some checks are pending
CI 3DS / build (push) Waiting to run
Details
CI Android / build (push) Waiting to run
Details
CI DOS/DJGPP / build (push) Waiting to run
Details
CI Emscripten / build (push) Waiting to run
Details
CI GameCube / build (push) Waiting to run
Details
CI Linux (i686) / build (push) Waiting to run
Details
CI Windows (MSVC) / msvc (Debug, x64, 2019) (push) Waiting to run
Details
CI Windows (MSVC) / msvc (Debug, x64, 2022) (push) Waiting to run
Details
CI Windows (MSVC) / msvc (Release, x64, 2019) (push) Waiting to run
Details
CI Windows (MSVC) / msvc (Release, x64, 2022) (push) Waiting to run
Details
CI Windows (MSVC) / msvc (Release, x64, UWP) (push) Waiting to run
Details
CI Windows (MSVC) / msvc (ReleaseAngle, x64, UWP) (push) Waiting to run
Details
CI Windows (MSYS2) / msys2-build-test (CLANG64) (push) Waiting to run
Details
CI Windows (MSYS2) / msys2-build-test (MINGW64) (push) Waiting to run
Details
CI Windows (MSYS2) / msys2-build-test (UCRT64) (push) Waiting to run
Details
CI macOS / build (push) Waiting to run
Details
CI Miyoo ARM32 / build (push) Waiting to run
Details
CI PS2 / build (push) Waiting to run
Details
CI PS4/ORBIS / build (push) Waiting to run
Details
CI PSP / build (push) Waiting to run
Details
CI PSVita / build (push) Waiting to run
Details
CI RS90 Odbeta MIPS32 / build (push) Waiting to run
Details
CI RetroFW MIPS32 / build (push) Waiting to run
Details
CI Switch/libnx / build (push) Waiting to run
Details
CI Wii / build (push) Waiting to run
Details
CI WiiU / build (push) Waiting to run
Details
CI Windows i686 (MXE) / build (push) Waiting to run
Details
CI Windows x64 (MXE) / build (push) Waiting to run
Details
Crowdin Workflow / sync (push) Waiting to run
Details
RetroArch CI / linux-c89 (push) Waiting to run
Details
CI webOS / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
LibretroAdmin 2025-02-09 18:56:50 +01:00
parent f9fa557a95
commit 4faed7a84f
6 changed files with 89 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
audio/audio_driver.c
View File

@ -216,14 +216,6 @@ bool audio_driver_is_ai_service_speech_running(void)
}
#endif
static enum resampler_quality audio_driver_get_resampler_quality(
settings_t *settings)
{
if (settings)
return (enum resampler_quality)settings->uints.audio_resampler_quality;
return RESAMPLER_QUALITY_DONTCARE;
}
static bool audio_driver_free_devices_list(void)
{
audio_driver_state_t *audio_st = &audio_driver_st;
@ -344,24 +336,19 @@ static void audio_driver_mixer_deinit(void)
bool audio_driver_deinit(void)
{
settings_t *settings = config_get_ptr();
#ifdef HAVE_AUDIOMIXER
audio_driver_mixer_deinit();
#endif
audio_driver_free_devices_list();
return audio_driver_deinit_internal(
settings->bools.audio_enable);
return audio_driver_deinit_internal(config_get_ptr()->bools.audio_enable);
}
bool audio_driver_find_driver(
void *settings_data,
const char *prefix,
bool verbosity_enabled)
bool audio_driver_find_driver(void *settings_data,
const char *prefix, bool verbosity_enabled)
{
settings_t *settings = (settings_t*)settings_data;
int i = (int)driver_find_index(
"audio_driver",
settings->arrays.audio_driver);
const char *audio_drv = settings->arrays.audio_driver;
int i = (int)driver_find_index("audio_driver", audio_drv);
if (i >= 0)
audio_driver_st.current_audio = (const audio_driver_t*)
@ -372,8 +359,7 @@ bool audio_driver_find_driver(
if (verbosity_enabled)
{
unsigned d;
RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix,
settings->arrays.audio_driver);
RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix, audio_drv);
RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
for (d = 0; audio_drivers[d]; d++)
{
@ -596,9 +582,7 @@ const char *audio_driver_mixer_get_stream_name(unsigned i)
#endif
bool audio_driver_init_internal(
void *settings_data,
bool audio_cb_inited)
bool audio_driver_init_internal(void *settings_data, bool audio_cb_inited)
{
unsigned new_rate = 0;
float *out_samples_buf = NULL;
@ -677,7 +661,7 @@ bool audio_driver_init_internal(
if (!audio_init_thread(
&audio_driver_st.current_audio,
&audio_driver_st.context_audio_data,
*settings->arrays.audio_device
*settings->arrays.audio_device
? settings->arrays.audio_device : NULL,
settings->uints.audio_output_sample_rate, &new_rate,
audio_latency,
@ -692,8 +676,8 @@ bool audio_driver_init_internal(
#endif
{
audio_driver_st.context_audio_data =
audio_driver_st.current_audio->init(*settings->arrays.audio_device ?
settings->arrays.audio_device : NULL,
audio_driver_st.current_audio->init(*settings->arrays.audio_device
? settings->arrays.audio_device : NULL,
settings->uints.audio_output_sample_rate,
audio_latency,
settings->uints.audio_block_frames,
@ -749,8 +733,7 @@ bool audio_driver_init_internal(
else
audio_driver_st.resampler_ident[0] = '\0';
audio_driver_st.resampler_quality =
audio_driver_get_resampler_quality(settings);
audio_driver_st.resampler_quality = (enum resampler_quality)settings->uints.audio_resampler_quality;
if (!retro_resampler_realloc(
&audio_driver_st.resampler_data,
@ -1483,7 +1466,8 @@ void audio_driver_mixer_play_scroll_sound(bool direction_up)
bool audio_enable_menu = settings->bools.audio_enable_menu;
bool audio_enable_menu_scroll = settings->bools.audio_enable_menu_scroll;
if (audio_enable_menu && audio_enable_menu_scroll)
audio_driver_mixer_play_menu_sound(direction_up ? AUDIO_MIXER_SYSTEM_SLOT_UP : AUDIO_MIXER_SYSTEM_SLOT_DOWN);
audio_driver_mixer_play_menu_sound(direction_up
? AUDIO_MIXER_SYSTEM_SLOT_UP : AUDIO_MIXER_SYSTEM_SLOT_DOWN);
}
void audio_driver_mixer_play_stream_looped(unsigned i)
@ -1912,9 +1896,9 @@ void audio_driver_menu_sample(void)
(runloop_flags & RUNLOOP_FLAG_FASTMOTION) ? true : false);
sample_count -= 1024;
}
if ( recording_st->data &&
recording_st->driver &&
recording_st->driver->push_audio)
if ( recording_st->data
&& recording_st->driver
&& recording_st->driver->push_audio)
{
struct record_audio_data ffemu_data;

8
input/drivers/dinput.c
View File

@ -172,10 +172,10 @@ static void *dinput_init(const char *joypad_driver)
if (di->keyboard)
{
settings_t *settings = config_get_ptr();
DWORD flags = DISCL_NONEXCLUSIVE | DISCL_FOREGROUND;
if (settings->bools.input_nowinkey_enable)
flags |= DISCL_NOWINKEY;
bool input_nowinkey_enable = config_get_ptr()->bools.input_nowinkey_enable;
DWORD flags = DISCL_NONEXCLUSIVE | DISCL_FOREGROUND;
if (input_nowinkey_enable)
flags |= DISCL_NOWINKEY;
IDirectInputDevice8_SetDataFormat(di->keyboard, &c_dfDIKeyboard);
IDirectInputDevice8_SetCooperativeLevel(di->keyboard,

12
input/drivers/winraw_input.c
View File

@ -558,7 +558,7 @@ static LRESULT CALLBACK winraw_callback(
static void *winraw_init(const char *joypad_driver)
{
RAWINPUTDEVICE rid;
settings_t *settings = config_get_ptr();
bool input_nowinkey_enable = config_get_ptr()->bools.input_nowinkey_enable;
winraw_input_t *wr = (winraw_input_t *)
calloc(1, sizeof(winraw_input_t));
@ -585,7 +585,7 @@ static void *winraw_init(const char *joypad_driver)
rid.hwndTarget = wr->window;
rid.usUsagePage = 0x01; /* Generic desktop */
rid.usUsage = 0x06; /* Keyboard */
if (settings->bools.input_nowinkey_enable)
if (input_nowinkey_enable)
rid.dwFlags |= RIDEV_NOHOTKEYS; /* Disable win keys while focused */
if (!RegisterRawInputDevices(&rid, 1, sizeof(RAWINPUTDEVICE)))
@ -617,7 +617,7 @@ error:
rid.hwndTarget = NULL;
rid.usUsagePage = 0x01; /* Generic desktop */
rid.usUsage = 0x06; /* Keyboard */
if (settings->bools.input_nowinkey_enable)
if (input_nowinkey_enable)
rid.dwFlags |= RIDEV_NOHOTKEYS; /* Disable win keys while focused */
RegisterRawInputDevices(&rid, 1, sizeof(RAWINPUTDEVICE));
@ -992,8 +992,8 @@ bool winraw_handle_message(UINT msg,
static void winraw_free(void *data)
{
RAWINPUTDEVICE rid;
settings_t *settings = config_get_ptr();
winraw_input_t *wr = (winraw_input_t*)data;
winraw_input_t *wr = (winraw_input_t*)data;
bool input_nowinkey_enable = config_get_ptr()->bools.input_nowinkey_enable;
rid.dwFlags = RIDEV_REMOVE;
rid.hwndTarget = NULL;
@ -1006,7 +1006,7 @@ static void winraw_free(void *data)
rid.hwndTarget = NULL;
rid.usUsagePage = 0x01; /* Generic desktop */
rid.usUsage = 0x06; /* Keyboard */
if (settings->bools.input_nowinkey_enable)
if (input_nowinkey_enable)
rid.dwFlags |= RIDEV_NOHOTKEYS; /* Disable win keys while focused */
RegisterRawInputDevices(&rid, 1, sizeof(RAWINPUTDEVICE));

30
input/drivers_joypad/dinput_joypad_inl.h
View File

@ -124,9 +124,9 @@ static int32_t dinput_joypad_button_state(
static const unsigned check1 = (JOY_POVRIGHT/2);
static const unsigned check2 = (JOY_POVLEFT+JOY_POVRIGHT/2);
return (
(pov == JOY_POVFORWARD) ||
(pov == check1) ||
(pov == check2)
(pov == JOY_POVFORWARD)
|| (pov == check1)
|| (pov == check2)
);
}
case HAT_RIGHT_MASK:
@ -134,20 +134,20 @@ static int32_t dinput_joypad_button_state(
static const unsigned check1 = (JOY_POVRIGHT/2);
static const unsigned check2 = (JOY_POVRIGHT+JOY_POVRIGHT/2);
return (
(pov == JOY_POVRIGHT) ||
(pov == check1) ||
(pov == check2)
(pov == JOY_POVRIGHT)
|| (pov == check1)
|| (pov == check2)
);
}
case HAT_DOWN_MASK:
{
static const unsigned check1 = (JOY_POVRIGHT+JOY_POVRIGHT/2);
static const unsigned check2 = (JOY_POVBACKWARD+JOY_POVRIGHT/2);
return
return
(
(pov == JOY_POVBACKWARD) ||
(pov == check1) ||
(pov == check2)
(pov == JOY_POVBACKWARD)
|| (pov == check1)
|| (pov == check2)
);
}
case HAT_LEFT_MASK:
@ -157,9 +157,9 @@ static int32_t dinput_joypad_button_state(
return
(
(pov == JOY_POVLEFT) ||
(pov == check1) ||
(pov == check2)
(pov == JOY_POVLEFT)
|| (pov == check1)
|| (pov == check2)
);
}
default:
@ -284,12 +284,12 @@ static int16_t dinput_joypad_state(
const uint32_t joyaxis = (binds[i].joyaxis != AXIS_NONE)
? binds[i].joyaxis : joypad_info->auto_binds[i].joyaxis;
if (
(uint16_t)joykey != NO_BTN
(uint16_t)joykey != NO_BTN
&& dinput_joypad_button_state(
pad, (uint16_t)joykey))
ret |= ( 1 << i);
else if (joyaxis != AXIS_NONE &&
((float)abs(dinput_joypad_axis_state(pad, joyaxis))
((float)abs(dinput_joypad_axis_state(pad, joyaxis))
/ 0x8000) > joypad_info->axis_threshold)
ret |= (1 << i);
}

10
input/drivers_joypad/sdl_dingux_joypad.c
View File

@ -194,8 +194,8 @@ static bool sdl_dingux_rumble_init(dingux_joypad_rumble_t *rumble)
/* Check whether shake device has the required
* feature set */
if (!Shake_QueryEffectSupport(rumble->device, SHAKE_EFFECT_PERIODIC) ||
!Shake_QueryWaveformSupport(rumble->device, SHAKE_PERIODIC_SINE))
if ( !Shake_QueryEffectSupport(rumble->device, SHAKE_EFFECT_PERIODIC)
|| !Shake_QueryWaveformSupport(rumble->device, SHAKE_PERIODIC_SINE))
goto error;
/* In most cases it is recommended to use SHAKE_EFFECT_PERIODIC
@ -311,8 +311,7 @@ static bool sdl_dingux_joypad_set_rumble(unsigned pad,
{
dingux_joypad_t *joypad = (dingux_joypad_t*)&dingux_joypad;
if ((pad != 0) ||
!joypad->rumble.device)
if ((pad != 0) || !joypad->rumble.device)
return false;
switch (effect)
@ -336,8 +335,7 @@ static bool sdl_dingux_joypad_set_rumble_gain(unsigned pad, unsigned gain)
{
dingux_joypad_t *joypad = (dingux_joypad_t*)&dingux_joypad;
if ((pad != 0) ||
!joypad->rumble.device)
if ((pad != 0) || !joypad->rumble.device)
return false;
/* Gain is automatically capped by Shake_SetGain(),

82
menu/menu_displaylist.c
View File

@ -1071,16 +1071,14 @@ static size_t core_backup_list_get_entry_timestamp_str(
static unsigned menu_displaylist_parse_core_backup_list(
file_list_t *list, const char *core_path,
settings_t *settings, bool restore)
const char *dir_core_assets,
enum core_backup_date_separator_type date_separator,
bool restore)
{
enum msg_hash_enums enum_idx;
enum menu_settings_type settings_type;
unsigned count = 0;
core_backup_list_t *backup_list = NULL;
const char *dir_core_assets = settings->paths.directory_core_assets;
enum core_backup_date_separator_type
date_separator = (enum core_backup_date_separator_type)
settings->uints.menu_timedate_date_separator;
if (restore)
{
@ -1160,7 +1158,7 @@ static unsigned menu_displaylist_parse_core_backup_list(
}
static unsigned menu_displaylist_parse_core_manager_list(file_list_t *list,
settings_t *settings)
bool kiosk_mode_enable)
{
unsigned count = 0;
core_info_list_t *core_info_list = NULL;
@ -1225,7 +1223,7 @@ static unsigned menu_displaylist_parse_core_manager_list(file_list_t *list,
#ifndef IOS
/* Add 'sideload core' entry */
if (!settings->bools.kiosk_mode_enable)
if (!kiosk_mode_enable)
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_LIST),
msg_hash_to_str(MENU_ENUM_LABEL_SIDELOAD_CORE_LIST),
@ -1238,8 +1236,7 @@ static unsigned menu_displaylist_parse_core_manager_list(file_list_t *list,
}
#ifdef HAVE_MIST
static unsigned menu_displaylist_parse_core_manager_steam_list(
file_list_t *list, settings_t *settings)
static unsigned menu_displaylist_parse_core_manager_steam_list(file_list_t *list)
{
size_t i;
steam_core_dlc_list_t *dlc_list;
@ -1268,8 +1265,7 @@ static unsigned menu_displaylist_parse_core_manager_steam_list(
}
static unsigned menu_displaylist_parse_core_information_steam(
file_list_t *info_list, const char *info_path,
settings_t *settings)
file_list_t *info_list, const char *info_path)
{
steam_core_dlc_list_t *dlc_list;
unsigned count = 0;
@ -1409,7 +1405,7 @@ static unsigned menu_displaylist_parse_core_option_dropdown_list(
}
static unsigned menu_displaylist_parse_core_option_override_list(file_list_t *list,
settings_t *settings)
bool show_core_options_flush)
{
unsigned count = 0;
runloop_state_t *runloop_st = runloop_state_get_ptr();
@ -1418,8 +1414,6 @@ static unsigned menu_displaylist_parse_core_option_override_list(file_list_t *li
&& (runloop_st->core_options);
bool game_options_active = (flags & RUNLOOP_FLAG_GAME_OPTIONS_ACTIVE) ? true : false;
bool folder_options_active = (flags & RUNLOOP_FLAG_FOLDER_OPTIONS_ACTIVE) ? true : false;
bool show_core_options_flush = settings ?
settings->bools.quick_menu_show_core_options_flush : false;
/* Sanity check - cannot handle core option
* overrides if:
@ -1504,7 +1498,7 @@ end:
}
static unsigned menu_displaylist_parse_remap_file_manager_list(file_list_t *list,
settings_t *settings)
bool remap_save_on_exit)
{
unsigned count = 0;
uint32_t flags = runloop_get_flags();
@ -1512,7 +1506,6 @@ static unsigned menu_displaylist_parse_remap_file_manager_list(file_list_t *list
bool core_remap_active = (flags & RUNLOOP_FLAG_REMAPS_CORE_ACTIVE) ? true : false;
bool content_dir_remap_active = (flags & RUNLOOP_FLAG_REMAPS_CONTENT_DIR_ACTIVE) ? true : false;
bool game_remap_active = (flags & RUNLOOP_FLAG_REMAPS_GAME_ACTIVE) ? true : false;
bool remap_save_on_exit = settings->bools.remap_save_on_exit;
/* Sanity check - cannot handle remap files
* unless a valid core is running */
@ -1617,8 +1610,8 @@ static unsigned menu_displaylist_parse_remap_file_manager_list(file_list_t *list
if ( !remap_save_on_exit
&& (core_remap_active
|| content_dir_remap_active
|| game_remap_active) &&
menu_entries_append(list,
|| game_remap_active)
&& menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_REMAP_FILE_FLUSH),
msg_hash_to_str(MENU_ENUM_LABEL_REMAP_FILE_FLUSH),
MENU_ENUM_LABEL_REMAP_FILE_FLUSH,
@ -1645,8 +1638,8 @@ static unsigned menu_displaylist_parse_supported_cores(menu_displaylist_info_t *
#endif
/* Get core list */
if (core_info_get_list(&core_info_list) &&
core_info_list)
if ( core_info_get_list(&core_info_list)
&& core_info_list)
{
const char *detect_core_str = NULL;
const core_info_t *core_infos = NULL;
@ -4364,7 +4357,8 @@ static unsigned menu_displaylist_parse_playlists(
bool show_add_content = (settings->uints.menu_content_show_add_entry ==
MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB);
bool show_history = !string_is_equal(menu_ident, "rgui")
&& !(string_is_equal(menu_ident, "glui") && !settings->bools.menu_materialui_show_nav_bar);
&& !(string_is_equal(menu_ident, "glui")
&& !settings->bools.menu_materialui_show_nav_bar);
if (show_history)
{
@ -6549,8 +6543,8 @@ static unsigned menu_displaylist_parse_manual_content_scan_list(
count++;
/* Validate existing entries */
if (!(*manual_content_scan_get_overwrite_playlist_ptr()) &&
MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info_list,
if (!(*manual_content_scan_get_overwrite_playlist_ptr())
&& MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info_list,
MENU_ENUM_LABEL_MANUAL_CONTENT_SCAN_VALIDATE_ENTRIES, PARSE_ONLY_BOOL,
false) == 0)
count++;
@ -11606,8 +11600,8 @@ unsigned menu_displaylist_build_list(
build_list[i].checked = true;
break;
case MENU_ENUM_LABEL_MENU_RGUI_TRANSPARENCY:
if ((menu_rgui_color_theme != RGUI_THEME_CUSTOM) &&
(menu_rgui_color_theme != RGUI_THEME_DYNAMIC))
if ( (menu_rgui_color_theme != RGUI_THEME_CUSTOM)
&& (menu_rgui_color_theme != RGUI_THEME_DYNAMIC))
build_list[i].checked = true;
break;
case MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SPEED:
@ -11615,8 +11609,8 @@ unsigned menu_displaylist_build_list(
build_list[i].checked = true;
break;
case MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SCREENSAVER:
if ((menu_screensaver_timeout != 0) &&
(menu_rgui_particle_effect != RGUI_PARTICLE_EFFECT_NONE))
if ( (menu_screensaver_timeout != 0)
&& (menu_rgui_particle_effect != RGUI_PARTICLE_EFFECT_NONE))
build_list[i].checked = true;
break;
case MENU_ENUM_LABEL_MATERIALUI_PLAYLIST_ICONS_ENABLE:
@ -12317,8 +12311,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Add user index when display driver == rgui and sublabels
* are disabled, but only if there is more than one user */
if (
(is_rgui) &&
(max_users > 1)
(is_rgui)
&& (max_users > 1)
&& !settings->bools.menu_show_sublabels)
{
desc_len += strlcpy(descriptor + desc_len,
@ -13798,14 +13792,22 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
case DISPLAYLIST_CORE_RESTORE_BACKUP_LIST:
menu_entries_clear(info->list);
count = menu_displaylist_parse_core_backup_list(
info->list, info->path, settings, true);
info->list, info->path,
settings->paths.directory_core_assets,
(enum core_backup_date_separator_type)
settings->uints.menu_timedate_date_separator,
true);
info->flags |= MD_FLAG_NEED_REFRESH
| MD_FLAG_NEED_PUSH;
break;
case DISPLAYLIST_CORE_DELETE_BACKUP_LIST:
menu_entries_clear(info->list);
count = menu_displaylist_parse_core_backup_list(
info->list, info->path, settings, false);
info->list, info->path,
settings->paths.directory_core_assets,
(enum core_backup_date_separator_type)
settings->uints.menu_timedate_date_separator,
false);
info->flags |= MD_FLAG_NEED_REFRESH
| MD_FLAG_NEED_PUSH
| MD_FLAG_NEED_NAVIGATION_CLEAR;
@ -13821,7 +13823,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
size_t selection = menu_st->selection_ptr;
menu_entries_clear(info->list);
count = menu_displaylist_parse_core_manager_list
(info->list, settings);
(info->list, settings->bools.kiosk_mode_enable);
if (count == 0)
menu_entries_append(info->list,
@ -13844,7 +13846,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
#ifdef HAVE_MIST
case DISPLAYLIST_CORE_MANAGER_STEAM_LIST:
menu_entries_clear(info->list);
count = menu_displaylist_parse_core_manager_steam_list(info->list, settings);
count = menu_displaylist_parse_core_manager_steam_list(info->list);
info->flags &= ~MD_FLAG_NEED_REFRESH;
info->flags |= MD_FLAG_NEED_PUSH
| MD_FLAG_NEED_NAVIGATION_CLEAR;
@ -13866,7 +13868,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
info->flags |= MD_FLAG_NEED_PUSH
| MD_FLAG_NEED_NAVIGATION_CLEAR;
count =
menu_displaylist_parse_core_information_steam(info->list, info->path, settings);
menu_displaylist_parse_core_information_steam(info->list, info->path);
if (count == 0)
if (menu_entries_append(info->list,
@ -14120,7 +14122,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
size_t selection = menu_st->selection_ptr;
menu_entries_clear(info->list);
count = menu_displaylist_parse_core_option_override_list(info->list, settings);
count = menu_displaylist_parse_core_option_override_list(info->list,
settings->bools.quick_menu_show_core_options_flush);
/* Fallback, in case we open this menu while running
* a core without options */
@ -14151,7 +14154,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
size_t selection = menu_st->selection_ptr;
menu_entries_clear(info->list);
count = menu_displaylist_parse_remap_file_manager_list(info->list, settings);
count = menu_displaylist_parse_remap_file_manager_list(info->list,
settings->bools.remap_save_on_exit);
/* Fallback */
if (count == 0)
@ -14907,7 +14911,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_ADD_CONTENT_ENTRY_DISPLAY_MAIN_TAB) && !settings->bools.kiosk_mode_enable;
bool show_settings = settings->bools.menu_content_show_settings
&& ( (string_is_equal(menu_ident, "rgui"))
|| (string_is_equal(menu_ident, "glui") && !settings->bools.menu_materialui_show_nav_bar));
|| (string_is_equal(menu_ident, "glui")
&& !settings->bools.menu_materialui_show_nav_bar));
if ( string_is_equal(menu_ident, "glui")
&& settings->bools.menu_materialui_show_nav_bar)
@ -14962,7 +14967,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
/* Show History and Favorites in menus without sidebar/tabs */
if ( (string_is_equal(menu_ident, "rgui"))
|| (string_is_equal(menu_ident, "glui") && !settings->bools.menu_materialui_show_nav_bar))
|| (string_is_equal(menu_ident, "glui")
&& !settings->bools.menu_materialui_show_nav_bar))
{
if (settings->bools.menu_content_show_history)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list,