From 14aff4031bbf0a30db894bc04964dab11fcebd9f Mon Sep 17 00:00:00 2001 From: twinaphex <libretro@gmail.com> Date: Mon, 9 Mar 2015 19:20:15 +0100 Subject: [PATCH] g_settings.menu.throttle is no longer used and is enabled by default --- retroarch.cfg | 3 --- settings.c | 3 --- settings_data.c | 13 ------------- 3 files changed, 19 deletions(-) diff --git a/retroarch.cfg b/retroarch.cfg index ff5b9d0c86..d2ef84d48a 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -600,9 +600,6 @@ # Shows current core inside menu. # menu_core_enable = true -# Throttle the menu to ~60 FPS instead of using v-sync. Useful for 120+Hz monitors. -# menu_throttle = false - # Path to a .png image to set as menu wallpaper. # menu_wallpaper = diff --git a/settings.c b/settings.c index aab105433f..f9a62dabd3 100644 --- a/settings.c +++ b/settings.c @@ -491,7 +491,6 @@ static void config_set_defaults(void) g_settings.menu.mouse_enable = false; g_settings.menu.timedate_enable = true; g_settings.menu.core_enable = true; - g_settings.menu.throttle = false; *g_settings.menu.wallpaper = '\0'; g_settings.menu.navigation.wraparound.horizontal_enable = true; g_settings.menu.navigation.wraparound.vertical_enable = true; @@ -1121,7 +1120,6 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_BOOL(menu.collapse_subgroups_enable, "menu_collapse_subgroups_enable"); CONFIG_GET_BOOL(menu.show_advanced_settings, "menu_show_advanced_settings"); CONFIG_GET_PATH(menu.wallpaper, "menu_wallpaper"); - CONFIG_GET_BOOL(menu.throttle, "menu_throttle"); if (!strcmp(g_settings.menu.wallpaper, "default")) *g_settings.menu.wallpaper = '\0'; #endif @@ -1889,7 +1887,6 @@ bool config_save_file(const char *path) config_set_bool(conf,"menu_mouse_enable", g_settings.menu.mouse_enable); config_set_bool(conf,"menu_timedate_enable", g_settings.menu.timedate_enable); config_set_bool(conf,"menu_core_enable", g_settings.menu.core_enable); - config_set_bool(conf,"menu_throttle", g_settings.menu.throttle); config_set_path(conf, "menu_wallpaper", g_settings.menu.wallpaper); #endif config_set_bool(conf, "video_vsync", g_settings.video.vsync); diff --git a/settings_data.c b/settings_data.c index 33c98d3e93..92fb2ba2fe 100644 --- a/settings_data.c +++ b/settings_data.c @@ -5099,19 +5099,6 @@ static bool setting_data_append_list_menu_options( settings_list_current_add_values(list, list_info, "png"); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_EMPTY); - CONFIG_BOOL( - g_settings.menu.throttle, - "menu_throttle", - "Throttle menu speed", - false, - "OFF", - "ON", - group_info.name, - subgroup_info.name, - general_write_handler, - general_read_handler); - - CONFIG_BOOL( g_settings.menu.pause_libretro, "menu_pause_libretro",