From ed53be7c81527c5b70c881c0952804190e25f042 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 28 Apr 2017 13:43:47 +0200 Subject: [PATCH] Move all bool settings --- camera/camera_driver.c | 2 +- cheevos/cheevos.c | 20 +-- command.c | 46 ++--- configuration.c | 168 +++++++++--------- configuration.h | 260 ++++++++++++++-------------- frontend/frontend.c | 2 +- gfx/drivers/gl.c | 2 +- gfx/video_driver.c | 8 +- input/drivers_joypad/psp_joypad.c | 5 +- input/input_config.c | 4 +- input/input_driver.c | 31 ++-- input/input_remote.c | 4 +- list_special.c | 3 +- location/location_driver.c | 2 +- menu/cbs/menu_cbs_deferred_push.c | 8 +- menu/cbs/menu_cbs_left.c | 2 +- menu/cbs/menu_cbs_ok.c | 4 +- menu/cbs/menu_cbs_right.c | 2 +- menu/drivers/materialui.c | 6 +- menu/drivers/rgui.c | 10 +- menu/drivers/xmb.c | 28 +-- menu/drivers/xui.cpp | 8 +- menu/drivers/zarch.c | 2 +- menu/menu_display.c | 6 +- menu/menu_displaylist.c | 35 ++-- menu/menu_driver.c | 14 +- menu/menu_event.c | 14 +- menu/menu_input.c | 13 +- menu/menu_navigation.c | 4 +- menu/menu_setting.c | 170 +++++++++--------- menu/widgets/menu_filebrowser.c | 14 +- network/netplay/netplay_frontend.c | 21 ++- network/netplay/netplay_handshake.c | 2 +- network/netplay/netplay_io.c | 4 +- paths.c | 4 +- retroarch.c | 21 +-- runloop.c | 18 +- setting_list.c | 12 +- tasks/task_autodetect.c | 6 +- tasks/task_content.c | 28 +-- tasks/task_overlay.c | 4 +- tasks/task_save.c | 6 +- tasks/task_screenshot.c | 4 +- wifi/wifi_driver.c | 2 +- 44 files changed, 519 insertions(+), 510 deletions(-) diff --git a/camera/camera_driver.c b/camera/camera_driver.c index 4c3f54974d..c9ebdca33b 100644 --- a/camera/camera_driver.c +++ b/camera/camera_driver.c @@ -188,7 +188,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data) case RARCH_CAMERA_CTL_START: if (camera_driver && camera_data && camera_driver->start) { - if (settings->camera.allow) + if (settings->bools.camera_allow) return camera_driver->start(camera_data); runloop_msg_queue_push( diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index 51355d0a91..a7d717a55e 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -2143,7 +2143,7 @@ static void cheevos_make_unlock_url(const cheevo_t *cheevo, char* url, size_t ur url, url_size, "http://retroachievements.org/dorequest.php?r=awardachievement&u=%s&t=%s&a=%u&h=%d", settings->cheevos.username, cheevos_locals.token, cheevo->id, - settings->cheevos.hardcore_mode_enable ? 1 : 0 + settings->bools.cheevos_hardcore_mode_enable ? 1 : 0 ); url[url_size - 1] = 0; @@ -2180,7 +2180,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set) const cheevo_t *end = set->cheevos + set->count; int mode, valid; - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) mode = CHEEVOS_ACTIVE_HARDCORE; else mode = CHEEVOS_ACTIVE_SOFTCORE; @@ -2411,7 +2411,7 @@ static int cheevos_get_by_game_id(const char **json, settings_t *settings = config_get_ptr(); /* Just return OK if cheevos are disabled. */ - if (!settings->cheevos.enable) + if (!settings->bools.cheevos_enable) return 0; if (!cheevos_login(timeout)) @@ -3009,7 +3009,7 @@ bool cheevos_load(const void *data) /* Bail out if cheevos are disabled. * But set the above anyways, command_read_ram needs it. */ - if (!settings->cheevos.enable) + if (!settings->bools.cheevos_enable) return true; /* Use the supported extensions as a hint @@ -3094,7 +3094,7 @@ found: if (cheevos_get_by_game_id(&json, game_id, &timeout) == 0 && json != NULL) #endif { - if (!settings->cheevos.enable || !cheevos_parse(json)) + if (!settings->bools.cheevos_enable || !cheevos_parse(json)) { cheevos_deactivate_unlocks(game_id, &timeout); free((void*)json); @@ -3178,7 +3178,7 @@ void cheevos_populate_menu(void *data, bool hardcore) } } - if (settings->cheevos.test_unofficial) + if (settings->bools.cheevos_test_unofficial) { cheevo = cheevos_locals.unofficial.cheevos; end = cheevos_locals.unofficial.cheevos @@ -3280,11 +3280,11 @@ bool cheevos_toggle_hardcore_mode(void) settings_t *settings = config_get_ptr(); /* reset and deinit rewind to avoid cheat the score */ - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) { /* send reset core cmd to avoid any user savestate previusly loaded */ command_event(CMD_EVENT_RESET, NULL); - if (settings->rewind_enable) + if (settings->bools.rewind_enable) command_event(CMD_EVENT_REWIND_DEINIT, NULL); RARCH_LOG("%s\n", msg_hash_to_str(MSG_CHEEVOS_HARDCORE_MODE_ENABLE)); @@ -3293,7 +3293,7 @@ bool cheevos_toggle_hardcore_mode(void) } else { - if (settings->rewind_enable) + if (settings->bools.rewind_enable) command_event(CMD_EVENT_REWIND_INIT, NULL); } @@ -3306,7 +3306,7 @@ void cheevos_test(void) cheevos_test_cheevo_set(&cheevos_locals.core); - if (settings->cheevos.test_unofficial) + if (settings->bools.cheevos_test_unofficial) cheevos_test_cheevo_set(&cheevos_locals.unofficial); #ifdef CHEEVOS_ENABLE_LBOARDS diff --git a/command.c b/command.c index 554757d10b..35e1bf617a 100644 --- a/command.c +++ b/command.c @@ -201,11 +201,13 @@ static bool command_set_shader(const char *arg) static bool command_read_ram(const char *arg) { cheevos_var_t var; - const uint8_t * data; - unsigned nbytes; unsigned i; + unsigned nbytes; char reply[256]; - char *reply_at = NULL; + const uint8_t * data = NULL; + char *reply_at = NULL; + + reply[0] = '\0'; strlcpy(reply, "READ_CORE_RAM ", sizeof(reply)); reply_at = reply + strlen("READ_CORE_RAM "); @@ -1235,11 +1237,11 @@ static void command_event_load_auto_state(void) #endif #ifdef HAVE_CHEEVOS - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return; #endif - if (!settings->savestate_auto_load) + if (!settings->bools.savestate_auto_load) return; if (global) @@ -1271,7 +1273,7 @@ static void command_event_set_savestate_auto_index(void) settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - if (!settings->savestate_auto_index) + if (!settings->bools.savestate_auto_index) return; if (global) @@ -1369,7 +1371,7 @@ static bool command_event_init_core(enum rarch_core_type *data) runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL); /* auto overrides: apply overrides */ - if(settings->auto_overrides_enable) + if(settings->bools.auto_overrides_enable) { if (config_load_override()) runloop_ctl(RUNLOOP_CTL_SET_OVERRIDES_ACTIVE, NULL); @@ -1378,7 +1380,7 @@ static bool command_event_init_core(enum rarch_core_type *data) } /* Auto-remap: apply shader preset files */ - if(settings->auto_shaders_enable) + if(settings->bools.auto_shaders_enable) config_load_shader_preset(); @@ -1389,7 +1391,7 @@ static bool command_event_init_core(enum rarch_core_type *data) core_set_environment(&info); /* Auto-remap: apply remap files */ - if(settings->auto_remaps_enable) + if(settings->bools.auto_remaps_enable) config_load_remap(); /* Per-core saves: reset redirection paths */ @@ -1447,7 +1449,7 @@ static bool command_event_save_auto_state(void) settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - if (!settings || !settings->savestate_auto_save) + if (!settings || !settings->bools.savestate_auto_save) return false; if (!global) return false; @@ -1460,7 +1462,7 @@ static bool command_event_save_auto_state(void) return false; #ifdef HAVE_CHEEVOS - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return false; #endif @@ -1887,7 +1889,7 @@ bool command_event(enum event_command cmd, void *data) return false; #ifdef HAVE_CHEEVOS - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return false; #endif @@ -1930,11 +1932,11 @@ bool command_event(enum event_command cmd, void *data) { settings_t *settings = config_get_ptr(); #ifdef HAVE_CHEEVOS - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return false; #endif - if (settings->savestate_auto_index) + if (settings->bools.savestate_auto_index) { int new_state_slot = settings->state_slot + 1; configuration_set_int(settings, settings->state_slot, new_state_slot); @@ -2022,7 +2024,7 @@ bool command_event(enum event_command cmd, void *data) { #ifdef HAVE_CHEEVOS settings_t *settings = config_get_ptr(); - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return false; #endif @@ -2033,18 +2035,18 @@ bool command_event(enum event_command cmd, void *data) { settings_t *settings = config_get_ptr(); #ifdef HAVE_CHEEVOS - if (settings->cheevos.hardcore_mode_enable) + if (settings->bools.cheevos_hardcore_mode_enable) return false; #endif - if (settings->rewind_enable) + if (settings->bools.rewind_enable) state_manager_event_init((unsigned)settings->rewind_buffer_size); } break; case CMD_EVENT_REWIND_TOGGLE: { settings_t *settings = config_get_ptr(); - if (settings->rewind_enable) + if (settings->bools.rewind_enable) command_event(CMD_EVENT_REWIND_INIT, NULL); else command_event(CMD_EVENT_REWIND_DEINIT, NULL); @@ -2099,7 +2101,7 @@ bool command_event(enum event_command cmd, void *data) settings_t *settings = config_get_ptr(); command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); #ifdef HAVE_OVERLAY - if (settings->input.overlay_enable) + if (settings->bools.input_overlay_enable) task_push_overlay_load_default(input_overlay_loaded, NULL); #endif } @@ -2173,7 +2175,7 @@ bool command_event(enum event_command cmd, void *data) { settings_t *settings = config_get_ptr(); command_event(CMD_EVENT_HISTORY_DEINIT, NULL); - if (!settings->history_list_enable) + if (!settings->bools.history_list_enable) return false; RARCH_LOG("%s: [%s].\n", @@ -2393,7 +2395,7 @@ bool command_event(enum event_command cmd, void *data) if (menu_driver_is_alive()) { settings_t *settings = config_get_ptr(); - if (settings->menu.pause_libretro) + if (settings->bools.menu_pause_libretro) command_event(CMD_EVENT_AUDIO_STOP, NULL); else command_event(CMD_EVENT_AUDIO_START, NULL); @@ -2401,7 +2403,7 @@ bool command_event(enum event_command cmd, void *data) else { settings_t *settings = config_get_ptr(); - if (settings->menu.pause_libretro) + if (settings->bools.menu_pause_libretro) command_event(CMD_EVENT_AUDIO_START, NULL); } #endif diff --git a/configuration.c b/configuration.c index c8a6d20fbf..e2ac6f66e8 100644 --- a/configuration.c +++ b/configuration.c @@ -726,28 +726,28 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("ui_companion_start_on_boot", &settings->bools.ui_companion_start_on_boot, true, ui_companion_start_on_boot, false); SETTING_BOOL("ui_companion_enable", &settings->bools.ui_companion_enable, true, ui_companion_enable, false); SETTING_BOOL("video_gpu_record", &settings->bools.video_gpu_record, true, gpu_record, false); - SETTING_BOOL("input_remap_binds_enable", &settings->input.remap_binds_enable, true, true, false); - SETTING_BOOL("all_users_control_menu", &settings->input.all_users_control_menu, true, all_users_control_menu, false); - SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->input.menu_swap_ok_cancel_buttons, true, menu_swap_ok_cancel_buttons, false); + SETTING_BOOL("input_remap_binds_enable", &settings->bools.input_remap_binds_enable, true, true, false); + SETTING_BOOL("all_users_control_menu", &settings->bools.input_all_users_control_menu, true, all_users_control_menu, false); + SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, menu_swap_ok_cancel_buttons, false); #ifdef HAVE_NETWORKING - SETTING_BOOL("netplay_public_announce", &settings->netplay.public_announce, true, netplay_public_announce, false); - SETTING_BOOL("netplay_start_as_spectator", &settings->netplay.start_as_spectator, false, netplay_start_as_spectator, false); - SETTING_BOOL("netplay_allow_slaves", &settings->netplay.allow_slaves, true, netplay_allow_slaves, false); - SETTING_BOOL("netplay_require_slaves", &settings->netplay.require_slaves, true, netplay_require_slaves, false); - SETTING_BOOL("netplay_stateless_mode", &settings->netplay.stateless_mode, true, netplay_stateless_mode, false); - SETTING_BOOL("netplay_client_swap_input", &settings->netplay.swap_input, true, netplay_client_swap_input, false); - SETTING_BOOL("netplay_use_mitm_server", &settings->netplay.use_mitm_server, true, netplay_use_mitm_server, false); + SETTING_BOOL("netplay_public_announce", &settings->bools.netplay_public_announce, true, netplay_public_announce, false); + SETTING_BOOL("netplay_start_as_spectator", &settings->bools.netplay_start_as_spectator, false, netplay_start_as_spectator, false); + SETTING_BOOL("netplay_allow_slaves", &settings->bools.netplay_allow_slaves, true, netplay_allow_slaves, false); + SETTING_BOOL("netplay_require_slaves", &settings->bools.netplay_require_slaves, true, netplay_require_slaves, false); + SETTING_BOOL("netplay_stateless_mode", &settings->bools.netplay_stateless_mode, true, netplay_stateless_mode, false); + SETTING_BOOL("netplay_client_swap_input", &settings->bools.netplay_swap_input, true, netplay_client_swap_input, false); + SETTING_BOOL("netplay_use_mitm_server", &settings->bools.netplay_use_mitm_server, true, netplay_use_mitm_server, false); #endif - SETTING_BOOL("input_descriptor_label_show", &settings->input.input_descriptor_label_show, true, input_descriptor_label_show, false); - SETTING_BOOL("input_descriptor_hide_unbound", &settings->input.input_descriptor_hide_unbound, true, input_descriptor_hide_unbound, false); - SETTING_BOOL("load_dummy_on_core_shutdown", &settings->load_dummy_on_core_shutdown, true, load_dummy_on_core_shutdown, false); - SETTING_BOOL("check_firmware_before_loading", &settings->check_firmware_before_loading, true, check_firmware_before_loading, false); - SETTING_BOOL("builtin_mediaplayer_enable", &settings->multimedia.builtin_mediaplayer_enable, false, false /* TODO */, false); - SETTING_BOOL("builtin_imageviewer_enable", &settings->multimedia.builtin_imageviewer_enable, true, true, false); + SETTING_BOOL("input_descriptor_label_show", &settings->bools.input_descriptor_label_show, true, input_descriptor_label_show, false); + SETTING_BOOL("input_descriptor_hide_unbound", &settings->bools.input_descriptor_hide_unbound, true, input_descriptor_hide_unbound, false); + SETTING_BOOL("load_dummy_on_core_shutdown", &settings->bools.load_dummy_on_core_shutdown, true, load_dummy_on_core_shutdown, false); + SETTING_BOOL("check_firmware_before_loading", &settings->bools.check_firmware_before_loading, true, check_firmware_before_loading, false); + SETTING_BOOL("builtin_mediaplayer_enable", &settings->bools.multimedia_builtin_mediaplayer_enable, false, false /* TODO */, false); + SETTING_BOOL("builtin_imageviewer_enable", &settings->bools.multimedia_builtin_imageviewer_enable, true, true, false); SETTING_BOOL("fps_show", &settings->bools.video_fps_show, true, false, false); SETTING_BOOL("ui_menubar_enable", &settings->bools.ui_menubar_enable, true, true, false); SETTING_BOOL("suspend_screensaver_enable", &settings->bools.ui_suspend_screensaver_enable, true, true, false); - SETTING_BOOL("rewind_enable", &settings->rewind_enable, true, rewind_enable, false); + SETTING_BOOL("rewind_enable", &settings->bools.rewind_enable, true, rewind_enable, false); SETTING_BOOL("audio_sync", &settings->bools.audio_sync, true, audio_sync, false); SETTING_BOOL("video_shader_enable", &settings->bools.video_shader_enable, true, shader_enable, false); @@ -762,110 +762,110 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("video_force_aspect", &settings->bools.video_force_aspect, true, force_aspect, false); SETTING_BOOL("video_threaded", &settings->bools.video_threaded, true, video_threaded, false); SETTING_BOOL("video_shared_context", &settings->bools.video_shared_context, true, video_shared_context, false); - SETTING_BOOL("auto_screenshot_filename", &settings->auto_screenshot_filename, true, auto_screenshot_filename, false); + SETTING_BOOL("auto_screenshot_filename", &settings->bools.auto_screenshot_filename, true, auto_screenshot_filename, false); SETTING_BOOL("video_force_srgb_disable", &settings->bools.video_force_srgb_disable, true, false, false); SETTING_BOOL("video_fullscreen", &settings->bools.video_fullscreen, true, fullscreen, false); - SETTING_BOOL("bundle_assets_extract_enable", &settings->bundle_assets_extract_enable, true, bundle_assets_extract_enable, false); + SETTING_BOOL("bundle_assets_extract_enable", &settings->bools.bundle_assets_extract_enable, true, bundle_assets_extract_enable, false); SETTING_BOOL("video_vsync", &settings->bools.video_vsync, true, vsync, false); SETTING_BOOL("video_hard_sync", &settings->bools.video_hard_sync, true, hard_sync, false); SETTING_BOOL("video_black_frame_insertion", &settings->bools.video_black_frame_insertion, true, black_frame_insertion, false); SETTING_BOOL("video_disable_composition", &settings->bools.video_disable_composition, true, disable_composition, false); - SETTING_BOOL("pause_nonactive", &settings->pause_nonactive, true, pause_nonactive, false); + SETTING_BOOL("pause_nonactive", &settings->bools.pause_nonactive, true, pause_nonactive, false); SETTING_BOOL("video_gpu_screenshot", &settings->bools.video_gpu_screenshot, true, gpu_screenshot, false); SETTING_BOOL("video_post_filter_record", &settings->bools.video_post_filter_record, true, post_filter_record, false); - SETTING_BOOL("keyboard_gamepad_enable", &settings->input.keyboard_gamepad_enable, true, true, false); - SETTING_BOOL("core_set_supports_no_game_enable", &settings->set_supports_no_game_enable, true, true, false); + SETTING_BOOL("keyboard_gamepad_enable", &settings->bools.input_keyboard_gamepad_enable, true, true, false); + SETTING_BOOL("core_set_supports_no_game_enable", &settings->bools.set_supports_no_game_enable, true, true, false); SETTING_BOOL("audio_enable", &settings->bools.audio_enable, true, audio_enable, false); SETTING_BOOL("audio_mute_enable", &settings->bools.audio_mute_enable, true, false, false); - SETTING_BOOL("location_allow", &settings->location.allow, true, false, false); + SETTING_BOOL("location_allow", &settings->bools.location_allow, true, false, false); SETTING_BOOL("video_font_enable", &settings->bools.video_font_enable, true, font_enable, false); - SETTING_BOOL("core_updater_auto_extract_archive", &settings->network.buildbot_auto_extract_archive, true, true, false); - SETTING_BOOL("camera_allow", &settings->camera.allow, true, false, false); + SETTING_BOOL("core_updater_auto_extract_archive", &settings->bools.network_buildbot_auto_extract_archive, true, true, false); + SETTING_BOOL("camera_allow", &settings->bools.camera_allow, true, false, false); #if defined(VITA) - SETTING_BOOL("input_backtouch_enable", &settings->input.backtouch_enable, false, false, false); - SETTING_BOOL("input_backtouch_toggle", &settings->input.backtouch_toggle, false, false, false); + SETTING_BOOL("input_backtouch_enable", &settings->bools.input_backtouch_enable, false, false, false); + SETTING_BOOL("input_backtouch_toggle", &settings->bools.input_backtouch_toggle, false, false, false); #endif #if TARGET_OS_IPHONE - SETTING_BOOL("small_keyboard_enable", &settings->input.small_keyboard_enable, true, false, false); + SETTING_BOOL("small_keyboard_enable", &settings->bools.input_small_keyboard_enable, true, false, false); #endif #ifdef GEKKO SETTING_BOOL("video_vfilter", &settings->bools.video_vfilter, true, video_vfilter, false); #endif #ifdef HAVE_MENU - SETTING_BOOL("menu_unified_controls", &settings->menu.unified_controls, true, false, false); + SETTING_BOOL("menu_unified_controls", &settings->bools.menu_unified_controls, true, false, false); #ifdef HAVE_THREADS - SETTING_BOOL("threaded_data_runloop_enable", &settings->threaded_data_runloop_enable, true, threaded_data_runloop_enable, false); + SETTING_BOOL("threaded_data_runloop_enable", &settings->bools.threaded_data_runloop_enable, true, threaded_data_runloop_enable, false); #endif - SETTING_BOOL("menu_throttle_framerate", &settings->menu.throttle_framerate, true, true, false); - SETTING_BOOL("menu_linear_filter", &settings->menu.linear_filter, true, true, false); - SETTING_BOOL("dpi_override_enable", &settings->menu.dpi.override_enable, true, menu_dpi_override_enable, false); - SETTING_BOOL("menu_pause_libretro", &settings->menu.pause_libretro, true, true, false); - SETTING_BOOL("menu_mouse_enable", &settings->menu.mouse.enable, true, def_mouse_enable, false); - SETTING_BOOL("menu_pointer_enable", &settings->menu.pointer.enable, true, pointer_enable, false); - SETTING_BOOL("menu_timedate_enable", &settings->menu.timedate_enable, true, true, false); - SETTING_BOOL("menu_battery_level_enable", &settings->menu.battery_level_enable, true, true, false); - SETTING_BOOL("menu_core_enable", &settings->menu.core_enable, true, true, false); - SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->menu.dynamic_wallpaper_enable, true, false, false); + SETTING_BOOL("menu_throttle_framerate", &settings->bools.menu_throttle_framerate, true, true, false); + SETTING_BOOL("menu_linear_filter", &settings->bools.menu_linear_filter, true, true, false); + SETTING_BOOL("dpi_override_enable", &settings->bools.menu_dpi_override_enable, true, menu_dpi_override_enable, false); + SETTING_BOOL("menu_pause_libretro", &settings->bools.menu_pause_libretro, true, true, false); + SETTING_BOOL("menu_mouse_enable", &settings->bools.menu_mouse_enable, true, def_mouse_enable, false); + SETTING_BOOL("menu_pointer_enable", &settings->bools.menu_pointer_enable, true, pointer_enable, false); + SETTING_BOOL("menu_timedate_enable", &settings->bools.menu_timedate_enable, true, true, false); + SETTING_BOOL("menu_battery_level_enable", &settings->bools.menu_battery_level_enable, true, true, false); + SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false); + SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false); #ifdef HAVE_XMB - SETTING_BOOL("xmb_shadows_enable", &settings->menu.xmb.shadows_enable, true, xmb_shadows_enable, false); - SETTING_BOOL("xmb_show_settings", &settings->menu.xmb.show_settings, true, xmb_show_settings, false); + SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false); + SETTING_BOOL("xmb_show_settings", &settings->bools.menu_xmb_show_settings, true, xmb_show_settings, false); #ifdef HAVE_IMAGEVIEWER - SETTING_BOOL("xmb_show_images", &settings->menu.xmb.show_images, true, xmb_show_images, false); + SETTING_BOOL("xmb_show_images", &settings->bools.menu_xmb_show_images, true, xmb_show_images, false); #endif #ifdef HAVE_FFMPEG - SETTING_BOOL("xmb_show_music", &settings->menu.xmb.show_music, true, xmb_show_music, false); - SETTING_BOOL("xmb_show_video", &settings->menu.xmb.show_video, true, xmb_show_video, false); + SETTING_BOOL("xmb_show_music", &settings->bools.menu_xmb_show_music, true, xmb_show_music, false); + SETTING_BOOL("xmb_show_video", &settings->bools.menu_xmb_show_video, true, xmb_show_video, false); #endif #ifdef HAVE_NETWORKING - SETTING_BOOL("xmb_show_netplay", &settings->menu.xmb.show_netplay, true, xmb_show_netplay, false); + SETTING_BOOL("xmb_show_netplay", &settings->bools.menu_xmb_show_netplay, true, xmb_show_netplay, false); #endif - SETTING_BOOL("xmb_show_history", &settings->menu.xmb.show_history, true, xmb_show_history, false); + SETTING_BOOL("xmb_show_history", &settings->bools.menu_xmb_show_history, true, xmb_show_history, false); #ifdef HAVE_LIBRETRODB - SETTING_BOOL("xmb_show_add", &settings->menu.xmb.show_add, true, xmb_show_add, false); + SETTING_BOOL("xmb_show_add", &settings->bools.menu_xmb_show_add, true, xmb_show_add, false); #endif #endif - SETTING_BOOL("rgui_show_start_screen", &settings->menu_show_start_screen, false, false /* TODO */, false); - SETTING_BOOL("menu_navigation_wraparound_enable", &settings->menu.navigation.wraparound.enable, true, true, false); + SETTING_BOOL("rgui_show_start_screen", &settings->bools.menu_show_start_screen, false, false /* TODO */, false); + SETTING_BOOL("menu_navigation_wraparound_enable", &settings->bools.menu_navigation_wraparound_enable, true, true, false); SETTING_BOOL("menu_navigation_browser_filter_supported_extensions_enable", - &settings->menu.navigation.browser.filter.supported_extensions_enable, true, true, false); - SETTING_BOOL("menu_show_advanced_settings", &settings->menu.show_advanced_settings, true, show_advanced_settings, false); + &settings->bools.menu_navigation_browser_filter_supported_extensions_enable, true, true, false); + SETTING_BOOL("menu_show_advanced_settings", &settings->bools.menu_show_advanced_settings, true, show_advanced_settings, false); #endif #ifdef HAVE_CHEEVOS - SETTING_BOOL("cheevos_enable", &settings->cheevos.enable, true, cheevos_enable, false); - SETTING_BOOL("cheevos_test_unofficial", &settings->cheevos.test_unofficial, true, false, false); - SETTING_BOOL("cheevos_hardcore_mode_enable", &settings->cheevos.hardcore_mode_enable, true, false, false); + SETTING_BOOL("cheevos_enable", &settings->bools.cheevos_enable, true, cheevos_enable, false); + SETTING_BOOL("cheevos_test_unofficial", &settings->bools.cheevos_test_unofficial, true, false, false); + SETTING_BOOL("cheevos_hardcore_mode_enable", &settings->bools.cheevos_hardcore_mode_enable, true, false, false); #endif #ifdef HAVE_OVERLAY - SETTING_BOOL("input_overlay_enable", &settings->input.overlay_enable, true, config_overlay_enable_default(), false); - SETTING_BOOL("input_overlay_enable_autopreferred", &settings->input.overlay_enable_autopreferred, true, true, false); - SETTING_BOOL("input_overlay_hide_in_menu", &settings->input.overlay_hide_in_menu, true, overlay_hide_in_menu, false); + SETTING_BOOL("input_overlay_enable", &settings->bools.input_overlay_enable, true, config_overlay_enable_default(), false); + SETTING_BOOL("input_overlay_enable_autopreferred", &settings->bools.input_overlay_enable_autopreferred, true, true, false); + SETTING_BOOL("input_overlay_hide_in_menu", &settings->bools.input_overlay_hide_in_menu, true, overlay_hide_in_menu, false); #endif #ifdef HAVE_COMMAND - SETTING_BOOL("network_cmd_enable", &settings->network_cmd_enable, true, network_cmd_enable, false); - SETTING_BOOL("stdin_cmd_enable", &settings->stdin_cmd_enable, true, stdin_cmd_enable, false); + SETTING_BOOL("network_cmd_enable", &settings->bools.network_cmd_enable, true, network_cmd_enable, false); + SETTING_BOOL("stdin_cmd_enable", &settings->bools.stdin_cmd_enable, true, stdin_cmd_enable, false); #endif #ifdef HAVE_NETWORKGAMEPAD - SETTING_BOOL("network_remote_enable", &settings->network_remote_enable, false, false /* TODO */, false); + SETTING_BOOL("network_remote_enable", &settings->bools.network_remote_enable, false, false /* TODO */, false); #endif #ifdef HAVE_NETWORKING - SETTING_BOOL("netplay_nat_traversal", &settings->netplay.nat_traversal, true, true, false); + SETTING_BOOL("netplay_nat_traversal", &settings->bools.netplay_nat_traversal, true, true, false); #endif - SETTING_BOOL("block_sram_overwrite", &settings->block_sram_overwrite, true, block_sram_overwrite, false); - SETTING_BOOL("savestate_auto_index", &settings->savestate_auto_index, true, savestate_auto_index, false); - SETTING_BOOL("savestate_auto_save", &settings->savestate_auto_save, true, savestate_auto_save, false); - SETTING_BOOL("savestate_auto_load", &settings->savestate_auto_load, true, savestate_auto_load, false); - SETTING_BOOL("savestate_thumbnail_enable", &settings->savestate_thumbnail_enable, true, savestate_thumbnail_enable, false); - SETTING_BOOL("history_list_enable", &settings->history_list_enable, true, def_history_list_enable, false); - SETTING_BOOL("playlist_entry_remove", &settings->playlist_entry_remove, true, def_playlist_entry_remove, false); - SETTING_BOOL("game_specific_options", &settings->game_specific_options, true, default_game_specific_options, false); - SETTING_BOOL("auto_overrides_enable", &settings->auto_overrides_enable, true, default_auto_overrides_enable, false); - SETTING_BOOL("auto_remaps_enable", &settings->auto_remaps_enable, true, default_auto_remaps_enable, false); - SETTING_BOOL("auto_shaders_enable", &settings->auto_shaders_enable, true, default_auto_shaders_enable, false); - SETTING_BOOL("sort_savefiles_enable", &settings->sort_savefiles_enable, true, default_sort_savefiles_enable, false); - SETTING_BOOL("sort_savestates_enable", &settings->sort_savestates_enable, true, default_sort_savestates_enable, false); - SETTING_BOOL("config_save_on_exit", &settings->config_save_on_exit, true, config_save_on_exit, false); - SETTING_BOOL("show_hidden_files", &settings->show_hidden_files, true, show_hidden_files, false); - SETTING_BOOL("input_autodetect_enable", &settings->input.autodetect_enable, true, input_autodetect_enable, false); + SETTING_BOOL("block_sram_overwrite", &settings->bools.block_sram_overwrite, true, block_sram_overwrite, false); + SETTING_BOOL("savestate_auto_index", &settings->bools.savestate_auto_index, true, savestate_auto_index, false); + SETTING_BOOL("savestate_auto_save", &settings->bools.savestate_auto_save, true, savestate_auto_save, false); + SETTING_BOOL("savestate_auto_load", &settings->bools.savestate_auto_load, true, savestate_auto_load, false); + SETTING_BOOL("savestate_thumbnail_enable", &settings->bools.savestate_thumbnail_enable, true, savestate_thumbnail_enable, false); + SETTING_BOOL("history_list_enable", &settings->bools.history_list_enable, true, def_history_list_enable, false); + SETTING_BOOL("playlist_entry_remove", &settings->bools.playlist_entry_remove, true, def_playlist_entry_remove, false); + SETTING_BOOL("game_specific_options", &settings->bools.game_specific_options, true, default_game_specific_options, false); + SETTING_BOOL("auto_overrides_enable", &settings->bools.auto_overrides_enable, true, default_auto_overrides_enable, false); + SETTING_BOOL("auto_remaps_enable", &settings->bools.auto_remaps_enable, true, default_auto_remaps_enable, false); + SETTING_BOOL("auto_shaders_enable", &settings->bools.auto_shaders_enable, true, default_auto_shaders_enable, false); + SETTING_BOOL("sort_savefiles_enable", &settings->bools.sort_savefiles_enable, true, default_sort_savefiles_enable, false); + SETTING_BOOL("sort_savestates_enable", &settings->bools.sort_savestates_enable, true, default_sort_savestates_enable, false); + SETTING_BOOL("config_save_on_exit", &settings->bools.config_save_on_exit, true, config_save_on_exit, false); + SETTING_BOOL("show_hidden_files", &settings->bools.show_hidden_files, true, show_hidden_files, false); + SETTING_BOOL("input_autodetect_enable", &settings->bools.input_autodetect_enable, true, input_autodetect_enable, false); SETTING_BOOL("audio_rate_control", &settings->bools.audio_rate_control, true, rate_control, false); #ifdef HAVE_WASAPI SETTING_BOOL("audio_wasapi_exclusive_mode", &settings->bools.audio_wasapi_exclusive_mode, true, true, false); @@ -1101,9 +1101,9 @@ static void config_set_defaults(void) #endif #ifdef HAVE_FFMPEG - configuration_set_bool(settings, settings->multimedia.builtin_mediaplayer_enable, true); + configuration_set_bool(settings, settings->bools.multimedia_builtin_mediaplayer_enable, true); #else - configuration_set_bool(settings, settings->multimedia.builtin_mediaplayer_enable, false); + configuration_set_bool(settings, settings->bools.multimedia_builtin_mediaplayer_enable, false); #endif settings->video.scale = scale; @@ -1144,7 +1144,7 @@ static void config_set_defaults(void) #ifdef HAVE_MENU if (first_initialized) - settings->menu_show_start_screen = default_menu_show_start_screen; + settings->bools.menu_show_start_screen = default_menu_show_start_screen; settings->menu.entry_normal_color = menu_entry_normal_color; settings->menu.entry_hover_color = menu_entry_hover_color; settings->menu.title_color = menu_title_color; @@ -1856,7 +1856,7 @@ static bool config_load_file(const char *path, bool set_defaults, snprintf(tmp, sizeof(tmp), "network_remote_enable_user_p%u", i + 1); if (config_get_bool(conf, tmp, &tmp_bool)) - settings->network_remote_enable_user[i] = tmp_bool; + settings->bools.network_remote_enable_user[i] = tmp_bool; } #endif if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL)) @@ -1895,7 +1895,7 @@ static bool config_load_file(const char *path, bool set_defaults, #ifdef HAVE_NETWORKING if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_STATELESS_MODE, NULL)) - CONFIG_GET_BOOL_BASE(conf, settings, netplay.stateless_mode, "netplay_stateless_mode"); + CONFIG_GET_BOOL_BASE(conf, settings, bools.netplay_stateless_mode, "netplay_stateless_mode"); if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL)) CONFIG_GET_INT_BASE(conf, settings, netplay.check_frames, "netplay_check_frames"); if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT, NULL)) @@ -3069,7 +3069,7 @@ bool config_save_file(const char *path) tmp[0] = '\0'; snprintf(tmp, sizeof(tmp), "network_remote_enable_user_p%u", i + 1); - config_set_bool(conf, tmp, settings->network_remote_enable_user[i]); + config_set_bool(conf, tmp, settings->bools.network_remote_enable_user[i]); } #endif diff --git a/configuration.h b/configuration.h index 6f8d6ea5a9..a65e70a400 100644 --- a/configuration.h +++ b/configuration.h @@ -45,8 +45,8 @@ typedef struct settings struct { bool placeholder; - bool bundle_finished; + /* Video */ bool video_fullscreen; bool video_windowed_fullscreen; bool video_vsync; @@ -72,6 +72,7 @@ typedef struct settings bool video_force_srgb_disable; bool video_fps_show; + /* Audio */ bool audio_enable; bool audio_mute_enable; bool audio_sync; @@ -81,10 +82,135 @@ typedef struct settings bool audio_wasapi_float_format; #endif + /* Input */ + bool input_swap_override; + bool input_remap_binds_enable; + bool input_autodetect_enable; + bool input_overlay_enable; + bool input_overlay_enable_autopreferred; + bool input_overlay_hide_in_menu; + bool input_descriptor_label_show; + bool input_descriptor_hide_unbound; + bool input_all_users_control_menu; + bool input_menu_swap_ok_cancel_buttons; +#if defined(VITA) + bool input_backtouch_enable; + bool input_backtouch_toggle; +#endif +#if TARGET_OS_IPHONE + bool input_small_keyboard_enable; +#endif + bool input_keyboard_gamepad_enable; + +#ifdef HAVE_MENU + /* Menu */ + bool menu_show_start_screen; + bool menu_pause_libretro; + bool menu_timedate_enable; + bool menu_battery_level_enable; + bool menu_core_enable; + bool menu_dynamic_wallpaper_enable; + bool menu_throttle; + bool menu_mouse_enable; + bool menu_pointer_enable; + bool menu_navigation_wraparound_enable; + bool menu_navigation_browser_filter_supported_extensions_enable; + bool menu_dpi_override_enable; + bool menu_show_advanced_settings; + bool menu_throttle_framerate; + bool menu_linear_filter; + bool menu_xmb_shadows_enable; + bool menu_xmb_show_settings; + bool menu_xmb_show_images; + bool menu_xmb_show_music; + bool menu_xmb_show_video; + bool menu_xmb_show_netplay; + bool menu_xmb_show_history; + bool menu_xmb_show_add; + bool menu_unified_controls; +#endif + +#ifdef HAVE_NETWORKING + /* Netplay */ + bool netplay_public_announce; + bool netplay_start_as_spectator; + bool netplay_allow_slaves; + bool netplay_require_slaves; + bool netplay_stateless_mode; + bool netplay_swap_input; + bool netplay_nat_traversal; + bool netplay_use_mitm_server; +#endif + + /* Network */ + bool network_buildbot_auto_extract_archive; + + /* UI */ bool ui_menubar_enable; bool ui_suspend_screensaver_enable; bool ui_companion_start_on_boot; bool ui_companion_enable; + +#ifdef HAVE_CHEEVOS + /* Cheevos */ + bool cheevos_enable; + bool cheevos_test_unofficial; + bool cheevos_hardcore_mode_enable; +#endif + + /* Camera */ + bool camera_allow; + + /* WiFi */ + bool wifi_allow; + + /* Location */ + bool location_allow; + + /* Multimedia */ + bool multimedia_builtin_mediaplayer_enable; + bool multimedia_builtin_imageviewer_enable; + + /* Bundle */ + bool bundle_finished; + bool bundle_assets_extract_enable; + + /* Misc. */ +#ifdef HAVE_THREADS + bool threaded_data_runloop_enable; +#endif + bool set_supports_no_game_enable; + bool auto_screenshot_filename; + bool history_list_enable; + bool playlist_entry_remove; + bool rewind_enable; + bool pause_nonactive; + bool block_sram_overwrite; + bool savestate_auto_index; + bool savestate_auto_save; + bool savestate_auto_load; + bool savestate_thumbnail_enable; + bool network_cmd_enable; + bool stdin_cmd_enable; + bool network_remote_enable; + bool network_remote_enable_user[MAX_USERS]; + bool load_dummy_on_core_shutdown; + bool check_firmware_before_loading; + + bool game_specific_options; + bool auto_overrides_enable; + bool auto_remaps_enable; + bool auto_shaders_enable; + + bool sort_savefiles_enable; + bool sort_savestates_enable; + bool config_save_on_exit; + bool show_hidden_files; +#ifdef HAVE_LAKKA + bool ssh_enable; + bool samba_enable; + bool bluetooth_enable; +#endif } bools; bool modified; @@ -134,13 +260,8 @@ typedef struct settings struct { char driver[32]; - bool pause_libretro; - bool timedate_enable; - bool battery_level_enable; - bool core_enable; - bool dynamic_wallpaper_enable; + unsigned thumbnails; - bool throttle; struct { @@ -159,42 +280,13 @@ typedef struct settings struct { - bool enable; - } mouse; - - struct - { - bool enable; - } pointer; - - struct - { - struct - { - bool enable; - } wraparound; - struct - { - struct - { - bool supported_extensions_enable; - } filter; - } browser; - } navigation; - - struct - { - bool override_enable; unsigned override_value; } dpi; - bool show_advanced_settings; unsigned entry_normal_color; unsigned entry_hover_color; unsigned title_color; - bool throttle_framerate; - bool linear_filter; struct { @@ -204,14 +296,6 @@ typedef struct settings unsigned alpha_factor; unsigned theme; unsigned menu_color_theme; - bool shadows_enable; - bool show_settings; - bool show_images; - bool show_music; - bool show_video; - bool show_netplay; - bool show_history; - bool show_add; } xmb; struct @@ -219,19 +303,14 @@ typedef struct settings unsigned menu_color_theme; } materialui; - bool unified_controls; } menu; #endif -#ifdef HAVE_THREADS - bool threaded_data_runloop_enable; -#endif struct { char driver[32]; char device[255]; - bool allow; unsigned width; unsigned height; } camera; @@ -239,13 +318,11 @@ typedef struct settings struct { char driver[32]; - bool allow; } wifi; struct { char driver[32]; - bool allow; int update_interval_ms; int update_interval_distance; } location; @@ -282,43 +359,25 @@ typedef struct settings unsigned max_users; + /* Set by autoconfiguration in joypad_autoconfig_dir. * Does not override main binds. */ - bool swap_override; unsigned libretro_device[MAX_USERS]; unsigned analog_dpad_mode[MAX_USERS]; - bool remap_binds_enable; float axis_threshold; unsigned joypad_map[MAX_USERS]; unsigned device[MAX_USERS]; - bool autodetect_enable; unsigned turbo_period; unsigned turbo_duty_cycle; - bool overlay_enable; - bool overlay_enable_autopreferred; - bool overlay_hide_in_menu; float overlay_opacity; float overlay_scale; unsigned bind_timeout; - bool input_descriptor_label_show; - bool input_descriptor_hide_unbound; unsigned menu_toggle_gamepad_combo; - bool all_users_control_menu; - - bool menu_swap_ok_cancel_buttons; -#if defined(VITA) - bool backtouch_enable; - bool backtouch_toggle; -#endif -#if TARGET_OS_IPHONE - bool small_keyboard_enable; -#endif - bool keyboard_gamepad_enable; unsigned keyboard_gamepad_mapping_type; unsigned poll_type_behavior; } input; @@ -332,23 +391,11 @@ typedef struct settings { char buildbot_url[255]; char buildbot_assets_url[255]; - bool buildbot_auto_extract_archive; } network; - bool set_supports_no_game_enable; - - struct - { - bool builtin_mediaplayer_enable; - bool builtin_imageviewer_enable; - } multimedia; - #ifdef HAVE_CHEEVOS struct { - bool enable; - bool test_unofficial; - bool hardcore_mode_enable; char username[32]; char password[32]; } cheevos; @@ -358,7 +405,6 @@ typedef struct settings int state_slot; - bool bundle_assets_extract_enable; unsigned bundle_assets_extract_version_current; unsigned bundle_assets_extract_last_version; @@ -411,21 +457,13 @@ typedef struct settings #ifdef HAVE_NETWORKING struct { - bool public_announce; char server[255]; unsigned port; - bool start_as_spectator; - bool allow_slaves; - bool require_slaves; - bool stateless_mode; int check_frames; unsigned input_latency_frames_min; unsigned input_latency_frames_range; - bool swap_input; - bool nat_traversal; char password[128]; char spectate_password[128]; - bool use_mitm_server; } netplay; #endif @@ -433,61 +471,21 @@ typedef struct settings unsigned libretro_log_level; - bool auto_screenshot_filename; - - bool history_list_enable; - bool playlist_entry_remove; - bool rewind_enable; size_t rewind_buffer_size; unsigned rewind_granularity; float slowmotion_ratio; float fastforward_ratio; - bool pause_nonactive; unsigned autosave_interval; - bool block_sram_overwrite; - bool savestate_auto_index; - bool savestate_auto_save; - bool savestate_auto_load; - bool savestate_thumbnail_enable; - - bool network_cmd_enable; unsigned network_cmd_port; - bool stdin_cmd_enable; - bool network_remote_enable; - bool network_remote_enable_user[MAX_USERS]; unsigned network_remote_base_port; -#if defined(HAVE_MENU) - bool menu_show_start_screen; -#endif - bool load_dummy_on_core_shutdown; - bool check_firmware_before_loading; - - bool game_specific_options; - bool auto_overrides_enable; - bool auto_remaps_enable; - bool auto_shaders_enable; - - bool sort_savefiles_enable; - bool sort_savestates_enable; - char username[32]; #ifdef HAVE_LANGEXTRA unsigned int user_language; #endif - - bool config_save_on_exit; - bool show_hidden_files; - -#ifdef HAVE_LAKKA - bool ssh_enable; - bool samba_enable; - bool bluetooth_enable; -#endif - } settings_t; #define configuration_set_float(settings, var, newvar) \ diff --git a/frontend/frontend.c b/frontend/frontend.c index 8217aabcad..82d7ba1f9f 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -51,7 +51,7 @@ void main_exit(void *args) { settings_t *settings = config_get_ptr(); - if (settings->config_save_on_exit) + if (settings->bools.config_save_on_exit) command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL); #ifdef HAVE_MENU diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 0daab572b6..a9b7f5360f 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -920,7 +920,7 @@ static void gl_set_texture_frame(void *data, context_bind_hw_render(false); - menu_filter = settings->menu.linear_filter ? TEXTURE_FILTER_LINEAR : TEXTURE_FILTER_NEAREST; + menu_filter = settings->bools.menu_linear_filter ? TEXTURE_FILTER_LINEAR : TEXTURE_FILTER_NEAREST; if (!gl->menu_texture) glGenTextures(1, &gl->menu_texture); diff --git a/gfx/video_driver.c b/gfx/video_driver.c index f70fa89c4f..722130fd59 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -2274,13 +2274,13 @@ void video_driver_build_info(video_frame_info_t *video_info) video_info->menu_shader_pipeline = settings->menu.xmb.shader_pipeline; video_info->xmb_theme = settings->menu.xmb.theme; video_info->xmb_color_theme = settings->menu.xmb.menu_color_theme; - video_info->timedate_enable = settings->menu.timedate_enable; - video_info->battery_level_enable = settings->menu.battery_level_enable; - video_info->xmb_shadows_enable = settings->menu.xmb.shadows_enable; + video_info->timedate_enable = settings->bools.menu_timedate_enable; + video_info->battery_level_enable = settings->bools.menu_battery_level_enable; + video_info->xmb_shadows_enable = settings->bools.menu_xmb_shadows_enable; video_info->xmb_alpha_factor = settings->menu.xmb.alpha_factor; video_info->menu_wallpaper_opacity = settings->menu.wallpaper.opacity; - if (!settings->menu.pause_libretro) + if (!settings->bools.menu_pause_libretro) video_info->libretro_running = (rarch_ctl(RARCH_CTL_IS_INITED, NULL) && !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)); #else diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c index 757c536b98..b6c7023c7c 100644 --- a/input/drivers_joypad/psp_joypad.c +++ b/input/drivers_joypad/psp_joypad.c @@ -251,11 +251,12 @@ static void psp_joypad_poll(void) #if defined(VITA) if (psp2_model == SCE_KERNEL_MODEL_VITA && !menu_driver_is_alive() - && settings->input.backtouch_enable) + && settings->bools.input_backtouch_enable) { unsigned i; SceTouchData touch_surface = {0}; - sceTouchPeek(settings->input.backtouch_toggle ? SCE_TOUCH_PORT_FRONT : SCE_TOUCH_PORT_BACK, &touch_surface, 1); + sceTouchPeek(settings->bools.input_backtouch_toggle + ? SCE_TOUCH_PORT_FRONT : SCE_TOUCH_PORT_BACK, &touch_surface, 1); for (i = 0; i < touch_surface.reportNum; i++) { diff --git a/input/input_config.c b/input/input_config.c index 0621838855..e09b17814f 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -393,7 +393,7 @@ static void input_config_get_bind_string_joykey(char *buf, const char *prefix, const struct retro_keybind *bind, size_t size) { settings_t *settings = config_get_ptr(); - bool label_show = settings->input.input_descriptor_label_show; + bool label_show = settings->bools.input_descriptor_label_show; if (GET_HAT_DIR(bind->joykey)) { @@ -440,7 +440,7 @@ static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix, unsigned axis = 0; char dir = '\0'; settings_t *settings = config_get_ptr(); - bool label_show = settings->input.input_descriptor_label_show; + bool label_show = settings->bools.input_descriptor_label_show; if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE) { diff --git a/input/input_driver.c b/input/input_driver.c index e2fc2996f0..2ad602c888 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -350,7 +350,7 @@ int16_t input_state(unsigned port, unsigned device, { settings_t *settings = config_get_ptr(); - if (settings->input.remap_binds_enable) + if (settings->bools.input_remap_binds_enable) { switch (device) { @@ -603,7 +603,6 @@ static INLINE bool input_menu_keys_pressed_internal( return false; } -#ifdef HAVE_MENU static bool input_driver_toggle_button_combo( unsigned mode, uint64_t *trigger_input) { @@ -648,7 +647,6 @@ static bool input_driver_toggle_button_combo( return true; } -#endif /** * input_menu_keys_pressed: @@ -681,7 +679,7 @@ uint64_t input_menu_keys_pressed( const struct retro_keybind *binds_auto = NULL; unsigned max_users = settings->input.max_users; - if (settings->menu.unified_controls && !menu_input_dialog_get_display_kb()) + if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb()) return input_keys_pressed(old_input, last_input, trigger_input, runloop_paused, nonblock_state); @@ -732,7 +730,7 @@ uint64_t input_menu_keys_pressed( || input_menu_keys_pressed_internal( binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users, mtkey->valid, - settings->input.all_users_control_menu)) + settings->bools.input_all_users_control_menu)) ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE); } #endif @@ -744,7 +742,7 @@ uint64_t input_menu_keys_pressed( input_menu_keys_pressed_internal(binds, settings, joypad_info, i, max_users, mtkey->valid, - settings->input.all_users_control_menu)) + settings->bools.input_all_users_control_menu)) ret |= (UINT64_C(1) << i); } @@ -788,7 +786,7 @@ uint64_t input_menu_keys_pressed( ids[12][0] = RETROK_RETURN; ids[12][1] = RETRO_DEVICE_ID_JOYPAD_A; - if (settings->input.menu_swap_ok_cancel_buttons) + if (settings->bools.input_menu_swap_ok_cancel_buttons) { ids[11][1] = RETRO_DEVICE_ID_JOYPAD_A; ids[12][1] = RETRO_DEVICE_ID_JOYPAD_B; @@ -1161,13 +1159,15 @@ bool input_driver_owns_driver(void) bool input_driver_init_command(void) { #ifdef HAVE_COMMAND - settings_t *settings = config_get_ptr(); - if ( !settings->stdin_cmd_enable - && !settings->network_cmd_enable) + settings_t *settings = config_get_ptr(); + bool stdin_cmd_enable = settings->bools.stdin_cmd_enable; + bool network_cmd_enable = settings->bools.network_cmd_enable; + bool grab_stdin = input_driver_grab_stdin(); + + if (!stdin_cmd_enable && !network_cmd_enable) return false; - if (settings->stdin_cmd_enable - && input_driver_grab_stdin()) + if (stdin_cmd_enable && grab_stdin) { RARCH_WARN("stdin command interface is desired, but input driver has already claimed stdin.\n" "Cannot use this command interface.\n"); @@ -1177,9 +1177,8 @@ bool input_driver_init_command(void) if (command_network_new( input_driver_command, - settings->stdin_cmd_enable - && !input_driver_grab_stdin(), - settings->network_cmd_enable, + stdin_cmd_enable && !grab_stdin, + network_cmd_enable, settings->network_cmd_port)) return true; @@ -1216,7 +1215,7 @@ bool input_driver_init_remote(void) #ifdef HAVE_NETWORKGAMEPAD settings_t *settings = config_get_ptr(); - if (!settings->network_remote_enable) + if (!settings->bools.network_remote_enable) return false; input_driver_remote = input_remote_new( diff --git a/input/input_remote.c b/input/input_remote.c index 631f0ba50b..875c7fadab 100644 --- a/input/input_remote.c +++ b/input/input_remote.c @@ -138,7 +138,7 @@ input_remote_t *input_remote_new(uint16_t port, unsigned max_users) for(user = 0; user < max_users; user ++) { handle->net_fd[user] = -1; - if(settings->network_remote_enable_user[user]) + if(settings->bools.network_remote_enable_user[user]) if (!input_remote_init_network(handle, port, user)) goto error; } @@ -235,7 +235,7 @@ void input_remote_poll(input_remote_t *handle, unsigned max_users) for(user = 0; user < max_users; user++) { - if (settings->network_remote_enable_user[user]) + if (settings->bools.network_remote_enable_user[user]) { #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD) struct remote_message msg; diff --git a/list_special.c b/list_special.c index 2d90761abd..3eab331c7a 100644 --- a/list_special.c +++ b/list_special.c @@ -151,7 +151,8 @@ struct string_list *dir_list_new_special(const char *input_dir, return NULL; } - return dir_list_new(dir, exts, include_dirs, settings->show_hidden_files, type == DIR_LIST_CORE_INFO, recursive); + return dir_list_new(dir, exts, include_dirs, settings->bools.show_hidden_files, + type == DIR_LIST_CORE_INFO, recursive); } struct string_list *string_list_new_special(enum string_list_type type, diff --git a/location/location_driver.c b/location/location_driver.c index 026e483be7..1acad4862f 100644 --- a/location/location_driver.c +++ b/location/location_driver.c @@ -137,7 +137,7 @@ bool driver_location_start(void) if (location_driver && location_data && location_driver->start) { - if (settings->location.allow) + if (settings->bools.location_allow) return location_driver->start(location_data); runloop_msg_queue_push("Location is explicitly disabled.\n", 1, 180, true); diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index e34bf6252a..2094ef40c0 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -707,14 +707,14 @@ static int general_push(menu_displaylist_info_t *info, (void)settings; - if (settings->multimedia.builtin_mediaplayer_enable || - settings->multimedia.builtin_imageviewer_enable) + if (settings->bools.multimedia_builtin_mediaplayer_enable || + settings->bools.multimedia_builtin_imageviewer_enable) { struct retro_system_info sysinfo = {0}; (void)sysinfo; #ifdef HAVE_FFMPEG - if (settings->multimedia.builtin_mediaplayer_enable) + if (settings->bools.multimedia_builtin_mediaplayer_enable) { libretro_ffmpeg_retro_get_system_info(&sysinfo); strlcat(info->exts, "|", sizeof(info->exts)); @@ -722,7 +722,7 @@ static int general_push(menu_displaylist_info_t *info, } #endif #ifdef HAVE_IMAGEVIEWER - if (settings->multimedia.builtin_imageviewer_enable) + if (settings->bools.multimedia_builtin_imageviewer_enable) { libretro_imageviewer_retro_get_system_info(&sysinfo); strlcat(info->exts, "|", sizeof(info->exts)); diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 8502b7639b..a3038b3596 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -165,7 +165,7 @@ static int action_left_mainmenu(unsigned type, const char *label, menu_navigation_set_selection(0); if ((list_info.selection != 0) - || settings->menu.navigation.wraparound.enable) + || settings->bools.menu_navigation_wraparound_enable) push_list = 1; } else diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1b858c5af1..616e77c80c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1104,7 +1104,7 @@ static int generic_action_ok(const char *path, menu_display_set_msg_force(true); - if (config_replace(settings->config_save_on_exit, action_path)) + if (config_replace(settings->bools.config_save_on_exit, action_path)) { bool pending_push = false; menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push); @@ -2541,7 +2541,7 @@ static void cb_generic_download(void *task_data, break; case MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD: dir_path = settings->directory.core_assets; - extract = settings->network.buildbot_auto_extract_archive; + extract = settings->bools.network_buildbot_auto_extract_archive; break; case MENU_ENUM_LABEL_CB_UPDATE_CORE_INFO_FILES: dir_path = settings->path.libretro_info; diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 8839564396..45d5fc10bc 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -199,7 +199,7 @@ static int action_right_mainmenu(unsigned type, const char *label, menu_navigation_set_selection(0); if ((list_info.selection != (list_horiz_info.size + list_tabs_info.size)) - || settings->menu.navigation.wraparound.enable) + || settings->bools.menu_navigation_wraparound_enable) return action_right_goto_tab(); } else diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 6c90205e64..d1e698b632 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -589,7 +589,7 @@ static void mui_render(void *data) menu_display_set_height(height); header_height = menu_display_get_header_height(); - if (settings->menu.pointer.enable) + if (settings->bools.menu_pointer_enable) { int16_t pointer_y = menu_input_pointer_state(MENU_POINTER_Y_AXIS); float old_accel_val = 0.0f; @@ -616,7 +616,7 @@ static void mui_render(void *data) menu_input_ctl(MENU_INPUT_CTL_POINTER_ACCEL_WRITE, &new_accel_val); } - if (settings->menu.mouse.enable) + if (settings->bools.menu_mouse_enable) { int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS); @@ -872,7 +872,7 @@ static int mui_get_core_title(char *s, size_t len) core_name = system->library_name; core_version = system->library_version; - if (!settings->menu.core_enable) + if (!settings->bools.menu_core_enable) return -1; if (info) diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 1d7bebc90a..dfc97dde27 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -439,7 +439,7 @@ static void rgui_render(void *data) rgui->force_redraw = false; - if (settings->menu.pointer.enable) + if (settings->bools.menu_pointer_enable) { unsigned new_val; @@ -465,7 +465,7 @@ static void rgui_render(void *data) } } - if (settings->menu.mouse.enable) + if (settings->bools.menu_mouse_enable) { unsigned new_mouse_ptr; int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS); @@ -538,14 +538,14 @@ static void rgui_render(void *data) RGUI_TERM_START_X(fb_width), title_buf, TITLE_COLOR(settings)); - if (settings->menu.core_enable && + if (settings->bools.menu_core_enable && menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0) blit_line( RGUI_TERM_START_X(fb_width), (RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) + RGUI_TERM_START_Y(fb_height) + 2, title_msg, hover_color); - if (settings->menu.timedate_enable) + if (settings->bools.menu_timedate_enable) { menu_display_ctx_datetime_t datetime; char timedate[255]; @@ -641,7 +641,7 @@ static void rgui_render(void *data) bool cursor_visible = settings->bools.video_fullscreen || !video_driver_has_windowed(); - if (settings->menu.mouse.enable && cursor_visible) + if (settings->bools.menu_mouse_enable && cursor_visible) rgui_blit_cursor(); } } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b6723c0f72..1d1ffbf064 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1010,7 +1010,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i) xmb->savestate_thumbnail_file_path[0] = '\0'; - if ( (settings->savestate_thumbnail_enable) + if ( (settings->bools.savestate_thumbnail_enable) && ((memcmp(entry.label, "state_slot", 10) == 0) || (memcmp(entry.label, "loadstate", 9) == 0) || (memcmp(entry.label, "savestate", 9) == 0))) @@ -1393,7 +1393,7 @@ static void xmb_list_switch_new(xmb_handle_t *xmb, size_t end = 0; settings_t *settings = config_get_ptr(); - if (settings->menu.dynamic_wallpaper_enable) + if (settings->bools.menu_dynamic_wallpaper_enable) { char path[PATH_MAX_LENGTH]; char *tmp = string_replace_substring(xmb->title_name, "/", " "); @@ -2361,6 +2361,8 @@ static void xmb_render(void *data) settings_t *settings = config_get_ptr(); xmb_handle_t *xmb = (xmb_handle_t*)data; unsigned end = (unsigned)menu_entries_get_size(); + bool mouse_enable = settings->bools.menu_mouse_enable; + bool pointer_enable = settings->bools.menu_pointer_enable; if (!xmb) return; @@ -2372,7 +2374,7 @@ static void xmb_render(void *data) if (menu_animation_get_ideal_delta_time(&delta)) menu_animation_update(delta.ideal); - if (settings->menu.pointer.enable || settings->menu.mouse.enable) + if (pointer_enable || mouse_enable) { size_t selection = menu_navigation_get_selection(); @@ -2385,13 +2387,13 @@ static void xmb_render(void *data) int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS) + (xmb->cursor.size/2); - if (settings->menu.pointer.enable) + if (pointer_enable) { if (pointer_y > item_y1 && pointer_y < item_y2) menu_input_ctl(MENU_INPUT_CTL_POINTER_PTR, &i); } - if (settings->menu.mouse.enable) + if (mouse_enable) { if (mouse_y > item_y1 && mouse_y < item_y2) menu_input_ctl(MENU_INPUT_CTL_MOUSE_PTR, &i); @@ -2631,7 +2633,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) xmb->margins.title.top, 1, 1, TEXT_ALIGN_LEFT, width, height, xmb->font); - if (settings->menu.core_enable && + if (settings->bools.menu_core_enable && menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0) xmb_draw_text(menu_disp_info, xmb, title_msg, xmb->margins.title.left, height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT, @@ -3209,26 +3211,26 @@ static void *xmb_init(void **userdata) xmb->system_tab_end = 0; xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN; - if (settings->menu.xmb.show_settings) + if (settings->bools.menu_xmb_show_settings) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS; - if (settings->menu.xmb.show_history) + if (settings->bools.menu_xmb_show_history) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_HISTORY; #ifdef HAVE_IMAGEVIEWER - if (settings->menu.xmb.show_images) + if (settings->bools.menu_xmb_show_images) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; #endif #ifdef HAVE_FFMPEG - if (settings->menu.xmb.show_music) + if (settings->bools.menu_xmb_show_music) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC; - if (settings->menu.xmb.show_video) + if (settings->bools.menu_xmb_show_video) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; #endif #ifdef HAVE_NETWORKING - if (settings->menu.xmb.show_netplay) + if (settings->bools.menu_xmb_show_netplay) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_NETPLAY; #endif #ifdef HAVE_LIBRETRODB - if (settings->menu.xmb.show_add) + if (settings->bools.menu_xmb_show_add) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD; #endif diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 6fac9572d5..24171bbfb4 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -167,7 +167,7 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) char str[PATH_MAX_LENGTH] = {0}; if ( - settings->menu.core_enable && + settings->bools.menu_core_enable && menu_entries_get_core_title(str, sizeof(str)) == 0) { mbstowcs(strw_buffer, str, sizeof(strw_buffer) / sizeof(wchar_t)); @@ -290,9 +290,9 @@ static void* xui_init(void **userdata) if (d3d->resolution_hd_enable) RARCH_LOG("HD menus enabled.\n"); - video_info.vsync = settings->video.vsync; + video_info.vsync = settings->bools.video_vsync; video_info.force_aspect = false; - video_info.smooth = settings->video.smooth; + video_info.smooth = settings->bools.video_smooth; video_info.input_scale = 2; video_info.fullscreen = true; video_info.rgb32 = false; @@ -571,7 +571,7 @@ static void xui_render(void *data) if (XuiHandleIsValid(m_menutitle)) { if ( - settings->menu.core_enable && + settings->bools.menu_core_enable && menu_entries_get_core_title(title, sizeof(title)) == 0) { mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t)); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 2ef39e0049..287d14aa60 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -932,7 +932,7 @@ static void zarch_frame(void *data, video_frame_info_t *video_info) break; } - if (settings->menu.mouse.enable) + if (settings->bools.menu_mouse.enable) zarch_zui_draw_cursor( zarch_zui_input_state(zui, MENU_ZARCH_MOUSE_X), zarch_zui_input_state(zui, MENU_ZARCH_MOUSE_Y)); diff --git a/menu/menu_display.c b/menu/menu_display.c index c9881e279a..d845f34e2c 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -307,7 +307,7 @@ void menu_display_set_font_framebuffer(const uint8_t *buffer) bool menu_display_libretro_running(void) { settings_t *settings = config_get_ptr(); - if (!settings->menu.pause_libretro) + if (!settings->bools.menu_pause_libretro) { if (rarch_ctl(RARCH_CTL_IS_INITED, NULL) && !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) @@ -440,7 +440,7 @@ float menu_display_get_dpi(void) metrics.type = DISPLAY_METRIC_DPI; metrics.value = &dpi; - if (settings->menu.dpi.override_enable) + if (settings->bools.menu_dpi_override_enable) return settings->menu.dpi.override_value; else if (!video_context_driver_get_metrics(&metrics) || !dpi) return menu_dpi_override_value; @@ -1005,7 +1005,7 @@ void menu_display_draw_cursor( bool cursor_visible = settings->bools.video_fullscreen || !video_driver_has_windowed(); - if (!settings->menu.mouse.enable) + if (!settings->bools.menu_mouse_enable) return; if (!cursor_visible) return; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 8b4fa7d96b..3ac69b2d0c 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1727,7 +1727,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) char tmp[PATH_MAX_LENGTH]; char crc_str[20]; database_info_t *db_info_entry = &db_info->list[i]; - bool show_advanced_settings = settings->menu.show_advanced_settings; + bool show_advanced_settings = settings->bools.menu_show_advanced_settings; crc_str[0] = tmp[0] = '\0'; @@ -2294,11 +2294,11 @@ static int menu_displaylist_parse_settings_internal(void *data, #ifdef HAVE_LAKKA if ((flags & SD_FLAG_ADVANCED || flags & SD_FLAG_LAKKA_ADVANCED) && - !settings->menu.show_advanced_settings) + !settings->bools.menu_show_advanced_settings) goto loop; #else if (flags & SD_FLAG_ADVANCED && - !settings->menu.show_advanced_settings) + !settings->bools.menu_show_advanced_settings) goto loop; #endif @@ -2487,11 +2487,11 @@ static int menu_displaylist_parse_settings_internal_enum(void *data, #ifdef HAVE_LAKKA if ((flags & SD_FLAG_ADVANCED || flags & SD_FLAG_LAKKA_ADVANCED) && - !settings->menu.show_advanced_settings) + !settings->bools.menu_show_advanced_settings) goto loop; #else if (flags & SD_FLAG_ADVANCED && - !settings->menu.show_advanced_settings) + !settings->bools.menu_show_advanced_settings) goto loop; #endif @@ -2651,7 +2651,7 @@ static int menu_displaylist_parse_load_content_settings( if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) { #ifdef HAVE_LAKKA - bool show_advanced_settings = settings->menu.show_advanced_settings; + bool show_advanced_settings = settings->bools.menu_show_advanced_settings; #endif rarch_system_info_t *system = runloop_get_system_info(); @@ -2773,7 +2773,7 @@ static int menu_displaylist_parse_load_content_settings( MENU_SETTING_ACTION, 0, 0); #ifdef HAVE_CHEEVOS - if(settings->cheevos.enable) + if(settings->bools.cheevos_enable) { menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST), @@ -2824,7 +2824,7 @@ static int menu_displaylist_parse_horizontal_content_actions( msg_hash_to_str(MENU_ENUM_LABEL_RUN), MENU_ENUM_LABEL_RUN, FILE_TYPE_PLAYLIST_ENTRY, 0, idx); - if (settings->playlist_entry_remove) + if (settings->bools.playlist_entry_remove) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY), msg_hash_to_str(MENU_ENUM_LABEL_DELETE_ENTRY), @@ -3304,7 +3304,7 @@ static int menu_displaylist_parse_playlists( return 0; } - str_list = dir_list_new(info->path, NULL, true, settings->show_hidden_files, true, false); + str_list = dir_list_new(info->path, NULL, true, settings->bools.show_hidden_files, true, false); if (!str_list) { @@ -3417,8 +3417,7 @@ static int menu_displaylist_parse_cores( } str_list = dir_list_new(info->path, info->exts, - true, settings->show_hidden_files, true, false); - + true, settings->bools.show_hidden_files, true, false); { char out_dir[PATH_MAX_LENGTH]; @@ -4492,7 +4491,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL, PARSE_ONLY_UINT, false); - if (settings->menu.show_advanced_settings) + if (settings->bools.menu_show_advanced_settings) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_PERFCNT_ENABLE, PARSE_ONLY_BOOL, false); @@ -4509,7 +4508,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SLOWMOTION_RATIO, PARSE_ONLY_FLOAT, false); - if (settings->menu.show_advanced_settings) + if (settings->bools.menu_show_advanced_settings) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE, PARSE_ONLY_BOOL, false); @@ -5756,7 +5755,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) } break; case DISPLAYLIST_HISTORY: - if (settings->history_list_enable) + if (settings->bools.history_list_enable) menu_displaylist_parse_playlist_history(menu, info, g_defaults.content_history, "history", @@ -5780,7 +5779,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) break; case DISPLAYLIST_IMAGES_HISTORY: #ifdef HAVE_IMAGEVIEWER - if (settings->history_list_enable) + if (settings->bools.history_list_enable) menu_displaylist_parse_playlist_history(menu, info, g_defaults.image_history, "images_history", @@ -5805,7 +5804,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) break; case DISPLAYLIST_MUSIC_HISTORY: #ifdef HAVE_FFMPEG - if (settings->history_list_enable) + if (settings->bools.history_list_enable) menu_displaylist_parse_playlist_history(menu, info, g_defaults.music_history, "music_history", @@ -5830,7 +5829,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) break; case DISPLAYLIST_VIDEO_HISTORY: #ifdef HAVE_FFMPEG - if (settings->history_list_enable) + if (settings->bools.history_list_enable) menu_displaylist_parse_playlist_history(menu, info, g_defaults.video_history, "video_history", @@ -6157,7 +6156,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) runloop_ctl(RUNLOOP_CTL_GET_CORE_OPTION_SIZE, &opts); - if (settings->game_specific_options) + if (settings->bools.game_specific_options) { if (!runloop_ctl(RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE, NULL)) menu_entries_append_enum(info->list, diff --git a/menu/menu_driver.c b/menu/menu_driver.c index c8e23edf0f..9f47ccf20b 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -184,18 +184,18 @@ static bool menu_init(menu_handle_t *menu_data) if (!menu_entries_ctl(MENU_ENTRIES_CTL_INIT, NULL)) return false; - if (settings->menu_show_start_screen) + if (settings->bools.menu_show_start_screen) { menu_dialog_push_pending(true, MENU_DIALOG_WELCOME); configuration_set_bool(settings, - settings->menu_show_start_screen, false); + settings->bools.menu_show_start_screen, false); - if (settings->config_save_on_exit) + if (settings->bools.config_save_on_exit) command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL); } - if ( settings->bundle_assets_extract_enable + if ( settings->bools.bundle_assets_extract_enable && !string_is_empty(settings->path.bundle_assets_src) && !string_is_empty(settings->path.bundle_assets_dst) #ifdef IOS @@ -268,7 +268,7 @@ static void menu_driver_toggle(bool on) /* Stop all rumbling before entering the menu. */ command_event(CMD_EVENT_RUMBLE_STOP, NULL); - if (settings && settings->menu.pause_libretro) + if (settings && settings->bools.menu_pause_libretro) command_event(CMD_EVENT_AUDIO_STOP, NULL); /* Override keyboard callback to redirect to menu instead. @@ -287,7 +287,7 @@ static void menu_driver_toggle(bool on) if (!runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL)) driver_set_nonblock_state(); - if (settings && settings->menu.pause_libretro) + if (settings && settings->bools.menu_pause_libretro) command_event(CMD_EVENT_AUDIO_START, NULL); /* Restore libretro keyboard callback. */ @@ -363,7 +363,7 @@ bool menu_driver_render(bool is_idle) if (BIT64_GET(menu_driver_data->state, MENU_STATE_BLIT)) { settings_t *settings = config_get_ptr(); - menu_animation_update_time(settings->menu.timedate_enable); + menu_animation_update_time(settings->bools.menu_timedate_enable); if (menu_driver_ctx->render) menu_driver_ctx->render(menu_userdata); diff --git a/menu/menu_event.c b/menu/menu_event.c index 2b992b8743..8dd9f1c597 100644 --- a/menu/menu_event.c +++ b/menu/menu_event.c @@ -123,11 +123,11 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) menu_input_t *menu_input = NULL; settings_t *settings = config_get_ptr(); static unsigned ok_old = 0; - unsigned menu_ok_btn = (!settings->input.swap_override && - settings->input.menu_swap_ok_cancel_buttons) ? + unsigned menu_ok_btn = (!settings->bools.input_swap_override && + settings->bools.input_menu_swap_ok_cancel_buttons) ? RETRO_DEVICE_ID_JOYPAD_B : RETRO_DEVICE_ID_JOYPAD_A; - unsigned menu_cancel_btn = (!settings->input.swap_override && - settings->input.menu_swap_ok_cancel_buttons) ? + unsigned menu_cancel_btn = (!settings->bools.input_swap_override && + settings->bools.input_menu_swap_ok_cancel_buttons) ? RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B; unsigned ok_current = (unsigned)(input & UINT64_C(1) << menu_ok_btn); unsigned ok_trigger = ok_current & ~ok_old; @@ -285,10 +285,10 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) if (runloop_cmd_press(trigger_input, RARCH_QUIT_KEY)) return MENU_ACTION_QUIT; - mouse_enabled = settings->menu.mouse.enable; + mouse_enabled = settings->bools.menu_mouse_enable; #ifdef HAVE_OVERLAY if (!mouse_enabled) - mouse_enabled = !(settings->input.overlay_enable + mouse_enabled = !(settings->bools.input_overlay_enable && input_overlay_is_alive(overlay_ptr)); #endif @@ -298,7 +298,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) if (!mouse_enabled) menu_input->mouse.ptr = 0; - if (settings->menu.pointer.enable) + if (settings->bools.menu_pointer_enable) menu_event_pointer(&ret); else { diff --git a/menu/menu_input.c b/menu/menu_input.c index 5afc7a06fd..5b44e0da88 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -126,9 +126,9 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse, static bool mouse_oldright = false; if ( - !settings->menu.mouse.enable + !settings->bools.menu_mouse_enable #ifdef HAVE_OVERLAY - || (settings->input.overlay_enable && input_overlay_is_alive(overlay_ptr)) + || (settings->bools.input_overlay_enable && input_overlay_is_alive(overlay_ptr)) #endif ) { @@ -220,11 +220,12 @@ static int menu_input_mouse_frame( int ret = 0; settings_t *settings = config_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr(); + bool mouse_enable = settings->bools.menu_mouse_enable; - if (settings->menu.mouse.enable) + if (mouse_enable) ret = menu_input_mouse_post_iterate(&mouse_state, cbs, action, &mouse_activity); - if ((settings->menu.pointer.enable || settings->menu.mouse.enable) + if ((settings->bools.menu_pointer_enable || mouse_enable) && menu_input_dialog_get_display_kb()) { menu_ctx_pointer_t point; @@ -418,7 +419,7 @@ static int menu_input_pointer_post_iterate( return -1; #ifdef HAVE_OVERLAY - if (( settings->input.overlay_enable + if (( settings->bools.input_overlay_enable && input_overlay_is_alive(overlay_ptr))) return 0; #endif @@ -579,7 +580,7 @@ void menu_input_post_iterate(int *ret, unsigned action) *ret = menu_input_mouse_frame(cbs, &entry, action); - if (settings->menu.pointer.enable) + if (settings->bools.menu_pointer_enable) *ret |= menu_input_pointer_post_iterate(cbs, &entry, action); } diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c index 5849d66013..0b11918795 100644 --- a/menu/menu_navigation.c +++ b/menu/menu_navigation.c @@ -69,7 +69,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data) settings_t *settings = config_get_ptr(); unsigned *scroll_speed = (unsigned*)data; size_t menu_list_size = menu_entries_get_size(); - bool wraparound_enable = settings->menu.navigation.wraparound.enable; + bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable; if (!scroll_speed) return false; @@ -114,7 +114,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data) settings_t *settings = config_get_ptr(); unsigned *scroll_speed = (unsigned*)data; size_t menu_list_size = menu_entries_get_size(); - bool wraparound_enable = settings->menu.navigation.wraparound.enable; + bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable; if (!scroll_speed) return false; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4930398ad6..1b61e54023 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -378,7 +378,7 @@ static int setting_string_action_right_driver(void *data, { settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) { drv.label = setting->name; drv.s = setting->value.target.string; @@ -1748,7 +1748,7 @@ static void overlay_enable_toggle_change_handler(void *data) if (!setting) return; - if (settings && settings->input.overlay_hide_in_menu) + if (settings && settings->bools.input_overlay_hide_in_menu) { command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); return; @@ -2061,7 +2061,7 @@ static bool setting_append_list_input_player_options( sizeof(label)); if ( - settings->input.input_descriptor_label_show + settings->bools.input_descriptor_label_show && (i < RARCH_FIRST_META_KEY) && core_has_set_input_descriptor() && (i != RARCH_TURBO_ENABLE) @@ -2076,7 +2076,7 @@ static bool setting_append_list_input_player_options( strlcat(label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(label)); - if (settings->input.input_descriptor_hide_unbound) + if (settings->bools.input_descriptor_hide_unbound) continue; } } @@ -2221,7 +2221,7 @@ static bool setting_append_list( &subgroup_info, parent_group); - if (settings->history_list_enable) + if (settings->bools.history_list_enable) { CONFIG_ACTION( list, list_info, @@ -2752,19 +2752,19 @@ static bool setting_append_list( bool_entries[0].default_value = video_shared_context; bool_entries[0].flags = SD_FLAG_ADVANCED; - bool_entries[1].target = &settings->load_dummy_on_core_shutdown; + bool_entries[1].target = &settings->bools.load_dummy_on_core_shutdown; bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN; bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN; bool_entries[1].default_value = load_dummy_on_core_shutdown; bool_entries[1].flags = SD_FLAG_ADVANCED; - bool_entries[2].target = &settings->set_supports_no_game_enable; + bool_entries[2].target = &settings->bools.set_supports_no_game_enable; bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE; bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE; bool_entries[2].default_value = true; bool_entries[2].flags = SD_FLAG_ADVANCED; - bool_entries[3].target = &settings->check_firmware_before_loading; + bool_entries[3].target = &settings->bools.check_firmware_before_loading; bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE; bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE; bool_entries[3].default_value = true; @@ -2811,37 +2811,37 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - bool_entries[0].target = &settings->config_save_on_exit; + bool_entries[0].target = &settings->bools.config_save_on_exit; bool_entries[0].name_enum_idx = MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT; bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT; bool_entries[0].default_value = config_save_on_exit; bool_entries[0].flags = SD_FLAG_NONE; - bool_entries[1].target = &settings->show_hidden_files; + bool_entries[1].target = &settings->bools.show_hidden_files; bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_SHOW_HIDDEN_FILES; bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES; bool_entries[1].default_value = show_hidden_files; bool_entries[1].flags = SD_FLAG_NONE; - bool_entries[2].target = &settings->game_specific_options; + bool_entries[2].target = &settings->bools.game_specific_options; bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS; bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS; bool_entries[2].default_value = default_game_specific_options; bool_entries[2].flags = SD_FLAG_ADVANCED; - bool_entries[3].target = &settings->auto_overrides_enable; + bool_entries[3].target = &settings->bools.auto_overrides_enable; bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE; bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE; bool_entries[3].default_value = default_auto_overrides_enable; bool_entries[3].flags = SD_FLAG_ADVANCED; - bool_entries[4].target = &settings->auto_remaps_enable; + bool_entries[4].target = &settings->bools.auto_remaps_enable; bool_entries[4].name_enum_idx = MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE; bool_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE; bool_entries[4].default_value = default_auto_remaps_enable; bool_entries[4].flags = SD_FLAG_ADVANCED; - bool_entries[5].target = &settings->auto_shaders_enable; + bool_entries[5].target = &settings->bools.auto_shaders_enable; bool_entries[5].name_enum_idx = MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE; bool_entries[5].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE; bool_entries[5].default_value = default_auto_shaders_enable; @@ -2947,43 +2947,43 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - bool_entries[0].target = &settings->sort_savefiles_enable; + bool_entries[0].target = &settings->bools.sort_savefiles_enable; bool_entries[0].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE; bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE; bool_entries[0].default_value = default_sort_savefiles_enable; bool_entries[0].flags = SD_FLAG_ADVANCED; - bool_entries[1].target = &settings->sort_savestates_enable; + bool_entries[1].target = &settings->bools.sort_savestates_enable; bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE; bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE; bool_entries[1].default_value = default_sort_savestates_enable; bool_entries[1].flags = SD_FLAG_ADVANCED; - bool_entries[2].target = &settings->block_sram_overwrite; + bool_entries[2].target = &settings->bools.block_sram_overwrite; bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE; bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE; bool_entries[2].default_value = block_sram_overwrite; bool_entries[2].flags = SD_FLAG_NONE; - bool_entries[3].target = &settings->savestate_auto_index; + bool_entries[3].target = &settings->bools.savestate_auto_index; bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX; bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX; bool_entries[3].default_value = savestate_auto_index; bool_entries[3].flags = SD_FLAG_NONE; - bool_entries[4].target = &settings->savestate_auto_save; + bool_entries[4].target = &settings->bools.savestate_auto_save; bool_entries[4].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE; bool_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE; bool_entries[4].default_value = savestate_auto_save; bool_entries[4].flags = SD_FLAG_NONE; - bool_entries[5].target = &settings->savestate_auto_load; + bool_entries[5].target = &settings->bools.savestate_auto_load; bool_entries[5].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD; bool_entries[5].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD; bool_entries[5].default_value = savestate_auto_load; bool_entries[5].flags = SD_FLAG_NONE; - bool_entries[6].target = &settings->savestate_thumbnail_enable; + bool_entries[6].target = &settings->bools.savestate_thumbnail_enable; bool_entries[6].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE; bool_entries[6].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE; bool_entries[6].default_value = savestate_thumbnail_enable; @@ -3041,7 +3041,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->rewind_enable, + &settings->bools.rewind_enable, MENU_ENUM_LABEL_REWIND_ENABLE, MENU_ENUM_LABEL_VALUE_REWIND_ENABLE, rewind_enable, @@ -3950,7 +3950,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.unified_controls, + &settings->bools.menu_unified_controls, MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS, MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS, false, @@ -3982,7 +3982,7 @@ static bool setting_append_list( #ifdef VITA CONFIG_BOOL( list, list_info, - &settings->input.backtouch_enable, + &settings->bools.input_backtouch_enable, MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE, input_backtouch_enable, @@ -3998,7 +3998,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.backtouch_toggle, + &settings->bools.input_backtouch_toggle, MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH, MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH, input_backtouch_toggle, @@ -4016,7 +4016,7 @@ static bool setting_append_list( #if TARGET_OS_IPHONE CONFIG_BOOL( list, list_info, - &settings->input.keyboard_gamepad_enable, + &settings->bools.input_keyboard_gamepad_enable, MENU_ENUM_LABEL_INPUT_ICADE_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE, false, @@ -4045,7 +4045,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.small_keyboard_enable, + &settings->bools.input_small_keyboard_enable, MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE, false, @@ -4075,7 +4075,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.menu_swap_ok_cancel_buttons, + &settings->bools.input_menu_swap_ok_cancel_buttons, MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, menu_swap_ok_cancel_buttons, @@ -4091,7 +4091,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.all_users_control_menu, + &settings->bools.input_all_users_control_menu, MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU, MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU, all_users_control_menu, @@ -4108,7 +4108,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.remap_binds_enable, + &settings->bools.input_remap_binds_enable, MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, true, @@ -4124,7 +4124,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.autodetect_enable, + &settings->bools.input_autodetect_enable, MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, input_autodetect_enable, @@ -4141,7 +4141,7 @@ static bool setting_append_list( #if 0 CONFIG_BOOL( list, list_info, - &settings->input.input_descriptor_label_show, + &settings->bools.input_descriptor_label_show, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW, true, @@ -4157,7 +4157,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.input_descriptor_hide_unbound, + &settings->bools.input_descriptor_hide_unbound, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND, input_descriptor_hide_unbound, @@ -4461,7 +4461,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.throttle_framerate, + &settings->bools.menu_throttle_framerate, MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE, MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE, true, @@ -4576,7 +4576,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.overlay_enable, + &settings->bools.input_overlay_enable, MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, config_overlay_enable_default(), @@ -4593,7 +4593,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.overlay_enable_autopreferred, + &settings->bools.input_overlay_enable_autopreferred, MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED, MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED, true, @@ -4610,7 +4610,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->input.overlay_hide_in_menu, + &settings->bools.input_overlay_hide_in_menu, MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU, MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU, overlay_hide_in_menu, @@ -4726,7 +4726,7 @@ static bool setting_append_list( { CONFIG_BOOL( list, list_info, - &settings->menu.dynamic_wallpaper_enable, + &settings->bools.menu_dynamic_wallpaper_enable, MENU_ENUM_LABEL_DYNAMIC_WALLPAPER, MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, true, @@ -4745,7 +4745,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.pause_libretro, + &settings->bools.menu_pause_libretro, MENU_ENUM_LABEL_PAUSE_LIBRETRO, MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO, true, @@ -4763,7 +4763,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.mouse.enable, + &settings->bools.menu_mouse_enable, MENU_ENUM_LABEL_MOUSE_ENABLE, MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE, def_mouse_enable, @@ -4779,7 +4779,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.pointer.enable, + &settings->bools.menu_pointer_enable, MENU_ENUM_LABEL_POINTER_ENABLE, MENU_ENUM_LABEL_VALUE_POINTER_ENABLE, pointer_enable, @@ -4795,7 +4795,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.linear_filter, + &settings->bools.menu_linear_filter, MENU_ENUM_LABEL_MENU_LINEAR_FILTER, MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, true, @@ -4822,7 +4822,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.navigation.wraparound.enable, + &settings->bools.menu_navigation_wraparound_enable, MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND, MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND, true, @@ -4841,7 +4841,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.show_advanced_settings, + &settings->bools.menu_show_advanced_settings, MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS, show_advanced_settings, @@ -4857,7 +4857,7 @@ static bool setting_append_list( #ifdef HAVE_THREADS CONFIG_BOOL( list, list_info, - &settings->threaded_data_runloop_enable, + &settings->bools.threaded_data_runloop_enable, MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE, MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE, threaded_data_runloop_enable, @@ -4926,7 +4926,7 @@ static bool setting_append_list( { CONFIG_BOOL( list, list_info, - &settings->menu.dpi.override_enable, + &settings->bools.menu_dpi_override_enable, MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE, MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE, menu_dpi_override_enable, @@ -5015,7 +5015,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.xmb.shadows_enable, + &settings->bools.menu_xmb_shadows_enable, MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE, MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, xmb_shadows_enable, @@ -5058,7 +5058,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_settings, + &settings->bools.menu_xmb_show_settings, MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, xmb_show_settings, @@ -5075,7 +5075,7 @@ static bool setting_append_list( #ifdef HAVE_IMAGEVIEWER CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_images, + &settings->bools.menu_xmb_show_images, MENU_ENUM_LABEL_XMB_SHOW_IMAGES, MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, xmb_show_images, @@ -5092,7 +5092,7 @@ static bool setting_append_list( #ifdef HAVE_FFMPEG CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_music, + &settings->bools.menu_xmb_show_music, MENU_ENUM_LABEL_XMB_SHOW_MUSIC, MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, xmb_show_music, @@ -5107,7 +5107,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_video, + &settings->bools.menu_xmb_show_video, MENU_ENUM_LABEL_XMB_SHOW_VIDEO, MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, xmb_show_video, @@ -5123,7 +5123,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_history, + &settings->bools.menu_xmb_show_history, MENU_ENUM_LABEL_XMB_SHOW_HISTORY, MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, xmb_show_history, @@ -5139,7 +5139,7 @@ static bool setting_append_list( #ifdef HAVE_NETWORKING CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_netplay, + &settings->bools.menu_xmb_show_netplay, MENU_ENUM_LABEL_XMB_SHOW_NETPLAY, MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY, xmb_show_netplay, @@ -5156,7 +5156,7 @@ static bool setting_append_list( #ifdef HAVE_LIBRETRODB CONFIG_BOOL( list, list_info, - &settings->menu.xmb.show_add, + &settings->bools.menu_xmb_show_add, MENU_ENUM_LABEL_XMB_SHOW_ADD, MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD, xmb_show_add, @@ -5223,7 +5223,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu_show_start_screen, + &settings->bools.menu_show_start_screen, MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN, MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN, default_menu_show_start_screen, @@ -5254,7 +5254,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.timedate_enable, + &settings->bools.menu_timedate_enable, MENU_ENUM_LABEL_TIMEDATE_ENABLE, MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE, true, @@ -5269,7 +5269,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.battery_level_enable, + &settings->bools.menu_battery_level_enable, MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE, MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE, true, @@ -5284,7 +5284,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.core_enable, + &settings->bools.menu_core_enable, MENU_ENUM_LABEL_CORE_ENABLE, MENU_ENUM_LABEL_VALUE_CORE_ENABLE, true, @@ -5311,7 +5311,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->menu.navigation.browser.filter.supported_extensions_enable, + &settings->bools.menu_navigation_browser_filter_supported_extensions_enable, MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, true, @@ -5340,7 +5340,7 @@ static bool setting_append_list( { CONFIG_BOOL( list, list_info, - &settings->multimedia.builtin_mediaplayer_enable, + &settings->bools.multimedia_builtin_mediaplayer_enable, MENU_ENUM_LABEL_USE_BUILTIN_PLAYER, MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER, true, @@ -5358,7 +5358,7 @@ static bool setting_append_list( #ifdef HAVE_IMAGEVIEWER CONFIG_BOOL( list, list_info, - &settings->multimedia.builtin_imageviewer_enable, + &settings->bools.multimedia_builtin_imageviewer_enable, MENU_ENUM_LABEL_USE_BUILTIN_IMAGE_VIEWER, MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER, true, @@ -5386,7 +5386,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->pause_nonactive, + &settings->bools.pause_nonactive, MENU_ENUM_LABEL_PAUSE_NONACTIVE, MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE, pause_nonactive, @@ -5481,7 +5481,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->history_list_enable, + &settings->bools.history_list_enable, MENU_ENUM_LABEL_HISTORY_LIST_ENABLE, MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE, true, @@ -5514,7 +5514,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->playlist_entry_remove, + &settings->bools.playlist_entry_remove, MENU_ENUM_LABEL_PLAYLIST_ENTRY_REMOVE, MENU_ENUM_LABEL_VALUE_PLAYLIST_ENTRY_REMOVE, def_playlist_entry_remove, @@ -5541,7 +5541,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->cheevos.enable, + &settings->bools.cheevos_enable, MENU_ENUM_LABEL_CHEEVOS_ENABLE, MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE, cheevos_enable, @@ -5557,7 +5557,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->cheevos.test_unofficial, + &settings->bools.cheevos_test_unofficial, MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL, MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL, true, @@ -5573,7 +5573,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->cheevos.hardcore_mode_enable, + &settings->bools.cheevos_hardcore_mode_enable, MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE, MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE, false, @@ -5629,7 +5629,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->network.buildbot_auto_extract_archive, + &settings->bools.network_buildbot_auto_extract_archive, MENU_ENUM_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, true, @@ -5662,7 +5662,7 @@ static bool setting_append_list( #endif CONFIG_BOOL( list, list_info, - &settings->netplay.public_announce, + &settings->bools.netplay_public_announce, MENU_ENUM_LABEL_NETPLAY_PUBLIC_ANNOUNCE, MENU_ENUM_LABEL_VALUE_NETPLAY_PUBLIC_ANNOUNCE, true, @@ -5677,7 +5677,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.use_mitm_server, + &settings->bools.netplay_use_mitm_server, MENU_ENUM_LABEL_NETPLAY_USE_MITM_SERVER, MENU_ENUM_LABEL_VALUE_NETPLAY_USE_MITM_SERVER, netplay_use_mitm_server, @@ -5750,7 +5750,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.start_as_spectator, + &settings->bools.netplay_start_as_spectator, MENU_ENUM_LABEL_NETPLAY_START_AS_SPECTATOR, MENU_ENUM_LABEL_VALUE_NETPLAY_START_AS_SPECTATOR, false, @@ -5765,7 +5765,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.allow_slaves, + &settings->bools.netplay_allow_slaves, MENU_ENUM_LABEL_NETPLAY_ALLOW_SLAVES, MENU_ENUM_LABEL_VALUE_NETPLAY_ALLOW_SLAVES, true, @@ -5781,7 +5781,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.require_slaves, + &settings->bools.netplay_require_slaves, MENU_ENUM_LABEL_NETPLAY_REQUIRE_SLAVES, MENU_ENUM_LABEL_VALUE_NETPLAY_REQUIRE_SLAVES, false, @@ -5797,7 +5797,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.stateless_mode, + &settings->bools.netplay_stateless_mode, MENU_ENUM_LABEL_NETPLAY_STATELESS_MODE, MENU_ENUM_LABEL_VALUE_NETPLAY_STATELESS_MODE, false, @@ -5853,7 +5853,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.nat_traversal, + &settings->bools.netplay_nat_traversal, MENU_ENUM_LABEL_NETPLAY_NAT_TRAVERSAL, MENU_ENUM_LABEL_VALUE_NETPLAY_NAT_TRAVERSAL, true, @@ -5869,7 +5869,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->netplay.swap_input, + &settings->bools.netplay_swap_input, MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT, MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, netplay_client_swap_input, @@ -5897,7 +5897,7 @@ static bool setting_append_list( #if defined(HAVE_NETWORK_CMD) CONFIG_BOOL( list, list_info, - &settings->network_cmd_enable, + &settings->bools.network_cmd_enable, MENU_ENUM_LABEL_NETWORK_CMD_ENABLE, MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE, network_cmd_enable, @@ -5926,7 +5926,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->network_remote_enable, + &settings->bools.network_remote_enable, MENU_ENUM_LABEL_NETWORK_REMOTE_ENABLE, MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE, false, @@ -5964,7 +5964,7 @@ static bool setting_append_list( CONFIG_BOOL_ALT( list, list_info, - &settings->network_remote_enable_user[user], + &settings->bools.network_remote_enable_user[user], /* todo: figure out this value, it's working fine but I don't think this is correct */ strdup(s1), strdup(s2), @@ -5983,7 +5983,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->stdin_cmd_enable, + &settings->bools.stdin_cmd_enable, MENU_ENUM_LABEL_STDIN_CMD_ENABLE, MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE, stdin_cmd_enable, @@ -6016,7 +6016,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->ssh_enable, + &settings->bools.ssh_enable, MENU_ENUM_LABEL_SSH_ENABLE, MENU_ENUM_LABEL_VALUE_SSH_ENABLE, true, @@ -6032,7 +6032,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->samba_enable, + &settings->bools.samba_enable, MENU_ENUM_LABEL_SAMBA_ENABLE, MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE, true, @@ -6048,7 +6048,7 @@ static bool setting_append_list( CONFIG_BOOL( list, list_info, - &settings->bluetooth_enable, + &settings->bools.bluetooth_enable, MENU_ENUM_LABEL_BLUETOOTH_ENABLE, MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE, true, @@ -6592,7 +6592,7 @@ static bool setting_append_list( { CONFIG_BOOL( list, list_info, - &settings->camera.allow, + &settings->bools.camera_allow, MENU_ENUM_LABEL_CAMERA_ALLOW, MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW, false, @@ -6610,7 +6610,7 @@ static bool setting_append_list( { CONFIG_BOOL( list, list_info, - &settings->location.allow, + &settings->bools.location_allow, MENU_ENUM_LABEL_LOCATION_ALLOW, MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, false, diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c index f302d2244e..7d141667f3 100644 --- a/menu/widgets/menu_filebrowser.c +++ b/menu/widgets/menu_filebrowser.c @@ -66,7 +66,7 @@ void filebrowser_parse(void *data, unsigned type_data) type_data; bool path_is_compressed = path_is_compressed_file(info->path); bool filter_ext = - settings->menu.navigation.browser.filter.supported_extensions_enable; + settings->bools.menu_navigation_browser_filter_supported_extensions_enable; if (string_is_equal(info->label, @@ -78,7 +78,7 @@ void filebrowser_parse(void *data, unsigned type_data) else str_list = dir_list_new(info->path, filter_ext ? info->exts : NULL, - true, settings->show_hidden_files, true, false); + true, settings->bools.show_hidden_files, true, false); #ifdef HAVE_LIBRETRODB if (filebrowser_types == FILEBROWSER_SCAN_DIR) @@ -181,26 +181,26 @@ void filebrowser_parse(void *data, unsigned type_data) } if (!is_dir && - (settings->multimedia.builtin_mediaplayer_enable || - settings->multimedia.builtin_imageviewer_enable)) + (settings->bools.multimedia_builtin_mediaplayer_enable || + settings->bools.multimedia_builtin_imageviewer_enable)) { switch (path_is_media_type(path)) { case RARCH_CONTENT_MOVIE: #ifdef HAVE_FFMPEG - if (settings->multimedia.builtin_mediaplayer_enable) + if (settings->bools.multimedia_builtin_mediaplayer_enable) file_type = FILE_TYPE_MOVIE; #endif break; case RARCH_CONTENT_MUSIC: #ifdef HAVE_FFMPEG - if (settings->multimedia.builtin_mediaplayer_enable) + if (settings->bools.multimedia_builtin_mediaplayer_enable) file_type = FILE_TYPE_MUSIC; #endif break; case RARCH_CONTENT_IMAGE: #ifdef HAVE_IMAGEVIEWER - if (settings->multimedia.builtin_imageviewer_enable + if (settings->bools.multimedia_builtin_imageviewer_enable && type != DISPLAYLIST_IMAGES) file_type = FILE_TYPE_IMAGEVIEWER; else diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 50ae5545e3..8562bb704c 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -622,8 +622,10 @@ static void netplay_announce(void) "game_name=%s&game_crc=%08X&port=%d" "&has_password=%d&has_spectate_password=%d&force_mitm=%d", username, corename, coreversion, gamename, *content_crc_ptr, - settings->netplay.port, *settings->netplay.password ? 1 : 0, *settings->netplay.spectate_password ? 1 : 0, - settings->netplay.use_mitm_server); + settings->netplay.port, + *settings->netplay.password ? 1 : 0, + *settings->netplay.spectate_password ? 1 : 0, + settings->bools.netplay_use_mitm_server); task_push_http_post_transfer(url, buf, true, NULL, netplay_announce_cb, NULL); @@ -766,7 +768,7 @@ bool netplay_pre_frame(netplay_t *netplay) retro_assert(netplay); - if (settings->netplay.public_announce) + if (settings->bools.netplay_public_announce) { reannounce++; if ((netplay->is_server || is_mitm) && (reannounce % 600 == 0)) @@ -788,7 +790,7 @@ bool netplay_pre_frame(netplay_t *netplay) netplay_try_init_serialization(netplay); } - if (netplay->is_server && !settings->netplay.use_mitm_server) + if (netplay->is_server && !settings->bools.netplay_use_mitm_server) { /* Advertise our server */ netplay_lan_ad_server(netplay); @@ -1198,7 +1200,7 @@ bool init_netplay(void *direct_host, const char *server, unsigned port) msg_hash_to_str(MSG_WAITING_FOR_CLIENT), 0, 180, false); - if (settings->netplay.public_announce) + if (settings->bools.netplay_public_announce) netplay_announce(); } @@ -1208,13 +1210,16 @@ bool init_netplay(void *direct_host, const char *server, unsigned port) : server_address_deferred) : NULL, netplay_is_client ? (!netplay_client_deferred ? port : server_port_deferred ) : (port != 0 ? port : RARCH_DEFAULT_PORT), - settings->netplay.stateless_mode, settings->netplay.check_frames, &cbs, - settings->netplay.nat_traversal, settings->username, + settings->bools.netplay_stateless_mode, + settings->netplay.check_frames, + &cbs, + settings->bools.netplay_nat_traversal, + settings->username, quirks); if (netplay_data) { - if (netplay_data->is_server && !settings->netplay.start_as_spectator) + if (netplay_data->is_server && !settings->bools.netplay_start_as_spectator) netplay_data->self_mode = NETPLAY_CONNECTION_PLAYING; return true; } diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index b2f1084766..cf5100c59c 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -1027,7 +1027,7 @@ bool netplay_handshake_pre_sync(netplay_t *netplay, netplay_recv_flush(&connection->recv_packet_buffer); /* Ask to switch to playing mode if we should */ - if (!settings->netplay.start_as_spectator) + if (!settings->bools.netplay_start_as_spectator) return netplay_cmd_mode(netplay, connection, NETPLAY_CONNECTION_PLAYING); else return true; diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index 7b007ffa74..f1106dad1d 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -694,9 +694,9 @@ static bool netplay_get_cmd(netplay_t *netplay, } /* Check if their slave mode request corresponds with what we allow */ - if (settings->netplay.require_slaves) + if (settings->bools.netplay_require_slaves) slave = true; - else if (!settings->netplay.allow_slaves) + else if (!settings->bools.netplay_allow_slaves) slave = false; payload[0] = htonl(netplay->self_frame_count + 1); diff --git a/paths.c b/paths.c index 5e79d82fba..c95219b1d1 100644 --- a/paths.c +++ b/paths.c @@ -98,7 +98,7 @@ void path_set_redirect(void) settings_t *settings = config_get_ptr(); /* per-core saves: append the library_name to the save location */ - if ( settings->sort_savefiles_enable + if ( settings->bools.sort_savefiles_enable && !string_is_empty(old_savefile_dir)) { fill_pathname_join( @@ -127,7 +127,7 @@ void path_set_redirect(void) } /* per-core states: append the library_name to the save location */ - if (settings->sort_savestates_enable + if (settings->bools.sort_savestates_enable && !string_is_empty(old_savestate_dir)) { fill_pathname_join( diff --git a/retroarch.c b/retroarch.c index c2573e613b..04937486b4 100644 --- a/retroarch.c +++ b/retroarch.c @@ -719,7 +719,8 @@ static void retroarch_parse_input(int argc, char *argv[]) { settings_t *settings = config_get_ptr(); - configuration_set_bool(settings, settings->netplay.stateless_mode, true); + configuration_set_bool(settings, + settings->bools.netplay_stateless_mode, true); retroarch_override_setting_set( RARCH_OVERRIDE_SETTING_NETPLAY_STATELESS_MODE, NULL); @@ -978,15 +979,15 @@ static void retroarch_validate_cpu_features(void) static void retroarch_main_init_media(void) { - settings_t *settings = config_get_ptr(); - const char *fullpath = path_get(RARCH_PATH_CONTENT); + settings_t *settings = config_get_ptr(); + const char *fullpath = path_get(RARCH_PATH_CONTENT); + bool builtin_imageviewer = settings->bools.multimedia_builtin_imageviewer_enable; + bool builtin_mediaplayer = settings->bools.multimedia_builtin_mediaplayer_enable; if (!settings) return; - if ( !settings->multimedia.builtin_mediaplayer_enable && - !settings->multimedia.builtin_imageviewer_enable - ) + if (!builtin_mediaplayer && !builtin_imageviewer) return; if (string_is_empty(fullpath)) @@ -996,7 +997,7 @@ static void retroarch_main_init_media(void) { case RARCH_CONTENT_MOVIE: case RARCH_CONTENT_MUSIC: - if (settings->multimedia.builtin_mediaplayer_enable) + if (builtin_mediaplayer) { #ifdef HAVE_FFMPEG retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL); @@ -1006,7 +1007,7 @@ static void retroarch_main_init_media(void) break; #ifdef HAVE_IMAGEVIEWER case RARCH_CONTENT_IMAGE: - if (settings->multimedia.builtin_imageviewer_enable) + if (builtin_imageviewer) { retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL); retroarch_set_current_core_type(CORE_TYPE_IMAGEVIEWER, false); @@ -1340,7 +1341,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #ifdef HAVE_OVERLAY { settings_t *settings = config_get_ptr(); - if (settings && settings->input.overlay_hide_in_menu) + if (settings && settings->bools.input_overlay_hide_in_menu) command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); } #endif @@ -1353,7 +1354,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #ifdef HAVE_OVERLAY { settings_t *settings = config_get_ptr(); - if (settings && settings->input.overlay_hide_in_menu) + if (settings && settings->bools.input_overlay_hide_in_menu) command_event(CMD_EVENT_OVERLAY_INIT, NULL); } #endif diff --git a/runloop.c b/runloop.c index ef27328786..73c0ccec42 100644 --- a/runloop.c +++ b/runloop.c @@ -498,7 +498,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) { #ifdef HAVE_THREADS settings_t *settings = config_get_ptr(); - bool threaded_enable = settings->threaded_data_runloop_enable; + bool threaded_enable = settings->bools.threaded_data_runloop_enable; #else bool threaded_enable = false; #endif @@ -565,7 +565,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) const struct retro_variable *vars = (const struct retro_variable*)data; - if (settings && settings->game_specific_options) + if (settings && settings->bools.game_specific_options) ret = rarch_game_specific_options(&game_options_path); if(ret) @@ -674,7 +674,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) */ #define time_to_exit(quit_key_pressed) (runloop_shutdown_initiated || quit_key_pressed || !is_alive || bsv_movie_ctl(BSV_MOVIE_CTL_END_EOF, NULL) || (runloop_max_frames && (frame_count >= runloop_max_frames)) || runloop_exec) -#define runloop_check_cheevos() (settings->cheevos.enable && cheevos_loaded && (!cheats_are_enabled && !cheats_were_enabled)) +#define runloop_check_cheevos() (settings->bools.cheevos_enable && cheevos_loaded && (!cheats_are_enabled && !cheats_were_enabled)) static enum runloop_state runloop_check_state( settings_t *settings, @@ -727,7 +727,7 @@ static enum runloop_state runloop_check_state( } else if (prev_overlay_restore) { - if (!settings->input.overlay_hide_in_menu) + if (!settings->bools.input_overlay_hide_in_menu) command_event(CMD_EVENT_OVERLAY_INIT, NULL); prev_overlay_restore = false; } @@ -738,7 +738,7 @@ static enum runloop_state runloop_check_state( if (runloop_exec) runloop_exec = false; - if (runloop_core_shutdown_initiated && settings->load_dummy_on_core_shutdown) + if (runloop_core_shutdown_initiated && settings->bools.load_dummy_on_core_shutdown) { content_ctx_info_t content_info; @@ -767,7 +767,7 @@ static enum runloop_state runloop_check_state( { enum menu_action action = (enum menu_action)menu_event(current_input, trigger_input); - bool focused = settings->pause_nonactive ? is_focused : true; + bool focused = settings->bools.pause_nonactive ? is_focused : true; focused = focused && !ui_companion_is_on_foreground(); @@ -828,14 +828,14 @@ static enum runloop_state runloop_check_state( if (menu_driver_is_alive()) { - if (!settings->menu.throttle_framerate && !settings->fastforward_ratio) + if (!settings->bools.menu_throttle_framerate && !settings->fastforward_ratio) return RUNLOOP_STATE_MENU_ITERATE; return RUNLOOP_STATE_END; } #endif - if (settings->pause_nonactive) + if (settings->bools.pause_nonactive) focused = is_focused; if (runloop_cmd_triggered(trigger_input, RARCH_SCREENSHOT)) @@ -974,7 +974,7 @@ static enum runloop_state runloop_check_state( command_event(CMD_EVENT_LOAD_STATE, NULL); #ifdef HAVE_CHEEVOS - if (!settings->cheevos.hardcore_mode_enable) + if (!settings->bools.cheevos_hardcore_mode_enable) #endif { char s[128]; diff --git a/setting_list.c b/setting_list.c index 0f33ce7b40..dca4568aae 100644 --- a/setting_list.c +++ b/setting_list.c @@ -155,7 +155,7 @@ static int setting_int_action_right_default(void *data, bool wraparound) settings_t *settings = config_get_ptr(); #ifdef HAVE_MENU - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.integer = min; else #endif @@ -267,7 +267,7 @@ static int setting_uint_action_right_default(void *data, bool wraparound) settings_t *settings = config_get_ptr(); #ifdef HAVE_MENU - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.unsigned_integer = min; else #endif @@ -334,7 +334,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.integer = min; else #endif @@ -352,7 +352,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.unsigned_integer = min; else #endif @@ -370,7 +370,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting, { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.fraction = min; else #endif @@ -454,7 +454,7 @@ static int setting_fraction_action_right_default( { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); - if (settings && settings->menu.navigation.wraparound.enable) + if (settings && settings->bools.menu_navigation_wraparound_enable) *setting->value.target.fraction = min; else #endif diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index dc2d8dd874..550e46d87e 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -163,7 +163,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, if (params->idx == 0) { settings_t *settings = config_get_ptr(); - configuration_set_bool(settings, settings->input.swap_override, true); + configuration_set_bool(settings, settings->bools.input_swap_override, true); } } else @@ -180,7 +180,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, if (config_get_bool(conf, "input_swap_override", &tmp)) { settings_t *settings = config_get_ptr(); - configuration_set_bool(settings, settings->input.swap_override, tmp); + configuration_set_bool(settings, settings->bools.input_swap_override, tmp); } } @@ -429,7 +429,7 @@ bool input_autoconfigure_connect( settings_t *settings = config_get_ptr(); const char *dir_autoconf = settings->directory.autoconfig; - if (!task || !state || !settings->input.autodetect_enable) + if (!task || !state || !settings->bools.input_autodetect_enable) goto error; if (!string_is_empty(display_name)) diff --git a/tasks/task_content.c b/tasks/task_content.c index bf1a1de15e..dc63c77021 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -904,7 +904,7 @@ static bool task_load_content(content_ctx_info_t *content_info, if (launched_from_cli) { settings_t *settings = config_get_ptr(); - content_ctx->history_list_enable = settings->history_list_enable; + content_ctx->history_list_enable = settings->bools.history_list_enable; } if ( @@ -1029,7 +1029,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info) if (!content_info) return false; - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.patch_is_blocked = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL); content_ctx.bios_is_missing = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL); content_ctx.history_list_enable = false; @@ -1043,7 +1043,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info) content_ctx.subsystem.data = NULL; content_ctx.subsystem.size = 0; - content_ctx.history_list_enable = settings->history_list_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); @@ -1103,7 +1103,7 @@ bool task_push_load_content_from_playlist_from_menu( char *error_string = NULL; settings_t *settings = config_get_ptr(); - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.patch_is_blocked = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL); content_ctx.bios_is_missing = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL); content_ctx.history_list_enable = false; @@ -1117,7 +1117,7 @@ bool task_push_load_content_from_playlist_from_menu( content_ctx.subsystem.data = NULL; content_ctx.subsystem.size = 0; - content_ctx.history_list_enable = settings->history_list_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); @@ -1179,7 +1179,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info) if (!content_info) return false; - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.patch_is_blocked = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL); content_ctx.bios_is_missing = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL); content_ctx.history_list_enable = false; @@ -1193,7 +1193,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info) content_ctx.subsystem.data = NULL; content_ctx.subsystem.size = 0; - content_ctx.history_list_enable = settings->history_list_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); @@ -1288,7 +1288,7 @@ bool task_push_load_content_with_new_core_from_menu( char *error_string = NULL; settings_t *settings = config_get_ptr(); - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.patch_is_blocked = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL); content_ctx.bios_is_missing = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL); content_ctx.history_list_enable = false; @@ -1302,7 +1302,7 @@ bool task_push_load_content_with_new_core_from_menu( content_ctx.subsystem.data = NULL; content_ctx.subsystem.size = 0; - content_ctx.history_list_enable = settings->history_list_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); @@ -1368,7 +1368,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info, char *error_string = NULL; settings_t *settings = config_get_ptr(); - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.patch_is_blocked = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL); content_ctx.bios_is_missing = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL); content_ctx.history_list_enable = false; @@ -1382,7 +1382,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info, content_ctx.subsystem.data = NULL; content_ctx.subsystem.size = 0; - content_ctx.history_list_enable = settings->history_list_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); @@ -1617,7 +1617,7 @@ bool content_init(void) temporary_content = string_list_new(); - content_ctx.check_firmware_before_loading = settings->check_firmware_before_loading; + content_ctx.check_firmware_before_loading = settings->bools.check_firmware_before_loading; content_ctx.temporary_content = temporary_content; content_ctx.history_list_enable = false; content_ctx.directory_system = NULL; @@ -1633,8 +1633,8 @@ bool content_init(void) if (sys_info) { - content_ctx.history_list_enable = settings->history_list_enable; - content_ctx.set_supports_no_game_enable = settings->set_supports_no_game_enable; + content_ctx.history_list_enable = settings->bools.history_list_enable; + content_ctx.set_supports_no_game_enable = settings->bools.set_supports_no_game_enable; if (!string_is_empty(settings->directory.system)) content_ctx.directory_system = strdup(settings->directory.system); diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 12ed321f06..934674355b 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -710,8 +710,8 @@ static void task_overlay_handler(retro_task_t *task) data->overlays = loader->overlays; data->size = loader->size; data->active = loader->active; - data->hide_in_menu = settings->input.overlay_hide_in_menu; - data->overlay_enable = settings->input.overlay_enable; + data->hide_in_menu = settings->bools.input_overlay_hide_in_menu; + data->overlay_enable = settings->bools.input_overlay_enable; data->overlay_opacity = settings->input.overlay_opacity; data->overlay_scale = settings->input.overlay_scale; diff --git a/tasks/task_save.c b/tasks/task_save.c index af8db56dc6..eb2af2e439 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -391,7 +391,7 @@ bool content_undo_load_state(void) * the backing up of it and * its flushing could all be in their * own functions... */ - if (settings->block_sram_overwrite && task_save_files + if (settings->bools.block_sram_overwrite && task_save_files && task_save_files->size) { RARCH_LOG("%s.\n", @@ -862,7 +862,7 @@ static void content_load_state_cb(void *task_data, return; } - if (settings->block_sram_overwrite && task_save_files + if (settings->bools.block_sram_overwrite && task_save_files && task_save_files->size) { RARCH_LOG("%s.\n", @@ -996,7 +996,7 @@ static void task_push_save_state(const char *path, void *data, size_t size, bool state->size = size; state->autosave = autosave; state->mute = autosave; /* don't show OSD messages if we are auto-saving */ - state->thumbnail_enable = settings->savestate_thumbnail_enable; + state->thumbnail_enable = settings->bools.savestate_thumbnail_enable; state->state_slot = settings->state_slot; task->type = TASK_TYPE_BLOCKING; diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index ae680ad6a7..c0889aeac7 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -225,7 +225,7 @@ static bool screenshot_dump( state->frame = frame; state->userbuf = userbuf; state->silence = savestate; - state->history_list_enable = settings->history_list_enable; + state->history_list_enable = settings->bools.history_list_enable; state->pixel_format_type = video_driver_get_pixel_format(); if (savestate) @@ -233,7 +233,7 @@ static bool screenshot_dump( sizeof(state->filename), "%s.png", name_base); else { - if (settings->auto_screenshot_filename) + if (settings->bools.auto_screenshot_filename) fill_str_dated_filename(state->shotname, path_basename(name_base), IMG_EXT, sizeof(state->shotname)); else diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c index 7963bd8073..466bc8c3f7 100644 --- a/wifi/wifi_driver.c +++ b/wifi/wifi_driver.c @@ -194,7 +194,7 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data) case RARCH_WIFI_CTL_START: if (wifi_driver && wifi_data && wifi_driver->start) { - if (settings->wifi.allow) + if (settings->bools.wifi_allow) return wifi_driver->start(wifi_data); } return false;