From 12471729f467957c9a1b99fafe7fc0c96099fed6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 2 Aug 2014 01:20:39 +0200 Subject: [PATCH] Move state_slot variable from g_extern to g_settings --- apple/iOS/menu.m | 4 +-- frontend/menu/backend/menu_common_backend.c | 12 +++---- general.h | 3 +- retroarch.c | 40 ++++++++++----------- settings.c | 4 +-- settings_data.c | 6 ++-- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index a507ade67d..00b98dcaeb 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -1155,14 +1155,14 @@ static bool copy_config(const char *src_path, const char *dst_path) result.accessoryView = accessory; } - [(id)result.accessoryView setSelectedSegmentIndex:(g_extern.state_slot < 10) ? g_extern.state_slot : -1]; + [(id)result.accessoryView setSelectedSegmentIndex:(g_settings.state_slot < 10) ? g_settings.state_slot : -1]; return result; } + (void)changed:(UISegmentedControl*)sender { - g_extern.state_slot = (int)sender.selectedSegmentIndex; + g_settings.state_slot = (int)sender.selectedSegmentIndex; } - (void)wasSelectedOnTableView:(UITableView *)tableView ofController:(UIViewController *)controller diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 381dcd3fdf..d6090c1009 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -3543,15 +3543,15 @@ static int menu_common_setting_set(unsigned setting, unsigned action) return -1; } else if (action == MENU_ACTION_START) - g_extern.state_slot = 0; + g_settings.state_slot = 0; else if (action == MENU_ACTION_LEFT) { // Slot -1 is (auto) slot. - if (g_extern.state_slot >= 0) - g_extern.state_slot--; + if (g_settings.state_slot >= 0) + g_settings.state_slot--; } else if (action == MENU_ACTION_RIGHT) - g_extern.state_slot++; + g_settings.state_slot++; break; case MENU_SETTINGS_SCREENSHOT: if (action == MENU_ACTION_OK) @@ -4777,10 +4777,10 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size, break; case MENU_SETTINGS_SAVESTATE_SAVE: case MENU_SETTINGS_SAVESTATE_LOAD: - if (g_extern.state_slot < 0) + if (g_settings.state_slot < 0) strlcpy(type_str, "-1 (auto)", type_str_size); else - snprintf(type_str, type_str_size, "%d", g_extern.state_slot); + snprintf(type_str, type_str_size, "%d", g_settings.state_slot); break; case MENU_SETTINGS_AUDIO_LATENCY: snprintf(type_str, type_str_size, "%d ms", g_settings.audio.latency); diff --git a/general.h b/general.h index 72f1038501..4a0d763432 100644 --- a/general.h +++ b/general.h @@ -308,6 +308,8 @@ struct settings char autoconfig_dir[PATH_MAX]; } input; + int state_slot; + char core_options_path[PATH_MAX]; char content_history_path[PATH_MAX]; unsigned game_history_size; @@ -457,7 +459,6 @@ struct global char bps_name[PATH_MAX]; char ips_name[PATH_MAX]; - int state_slot; struct { diff --git a/retroarch.c b/retroarch.c index 46054e0623..9335a7528e 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1778,8 +1778,8 @@ static void set_savestate_auto_index(void) dir_list_free(dir_list); - g_extern.state_slot = max_index; - RARCH_LOG("Found last state slot: #%u\n", g_extern.state_slot); + g_settings.state_slot = max_index; + RARCH_LOG("Found last state slot: #%u\n", g_settings.state_slot); } static void fill_pathnames(void) @@ -1911,9 +1911,9 @@ void rarch_load_state(void) { char load_path[PATH_MAX], msg[512]; - if (g_extern.state_slot > 0) - snprintf(load_path, sizeof(load_path), "%s%d", g_extern.savestate_name, g_extern.state_slot); - else if (g_extern.state_slot < 0) + if (g_settings.state_slot > 0) + snprintf(load_path, sizeof(load_path), "%s%d", g_extern.savestate_name, g_settings.state_slot); + else if (g_settings.state_slot < 0) snprintf(load_path, sizeof(load_path), "%s.auto", g_extern.savestate_name); else snprintf(load_path, sizeof(load_path), "%s", g_extern.savestate_name); @@ -1922,10 +1922,10 @@ void rarch_load_state(void) { if (load_state(load_path)) { - if (g_extern.state_slot < 0) + if (g_settings.state_slot < 0) snprintf(msg, sizeof(msg), "Loaded state from slot #-1 (auto)."); else - snprintf(msg, sizeof(msg), "Loaded state from slot #%d.", g_extern.state_slot); + snprintf(msg, sizeof(msg), "Loaded state from slot #%d.", g_settings.state_slot); } else snprintf(msg, sizeof(msg), "Failed to load state from \"%s\".", load_path); @@ -1943,11 +1943,11 @@ void rarch_save_state(void) char save_path[PATH_MAX], msg[512]; if (g_settings.savestate_auto_index) - g_extern.state_slot++; + g_settings.state_slot++; - if (g_extern.state_slot > 0) - snprintf(save_path, sizeof(save_path), "%s%d", g_extern.savestate_name, g_extern.state_slot); - else if (g_extern.state_slot < 0) + if (g_settings.state_slot > 0) + snprintf(save_path, sizeof(save_path), "%s%d", g_extern.savestate_name, g_settings.state_slot); + else if (g_settings.state_slot < 0) snprintf(save_path, sizeof(save_path), "%s.auto", g_extern.savestate_name); else snprintf(save_path, sizeof(save_path), "%s", g_extern.savestate_name); @@ -1956,10 +1956,10 @@ void rarch_save_state(void) { if (save_state(save_path)) { - if (g_extern.state_slot < 0) + if (g_settings.state_slot < 0) snprintf(msg, sizeof(msg), "Saved state to slot #-1 (auto)."); else - snprintf(msg, sizeof(msg), "Saved state to slot #%u.", g_extern.state_slot); + snprintf(msg, sizeof(msg), "Saved state to slot #%u.", g_settings.state_slot); } else snprintf(msg, sizeof(msg), "Failed to save state to \"%s\".", save_path); @@ -2026,13 +2026,13 @@ bool rarch_check_fullscreen(void) void rarch_state_slot_increase(void) { - g_extern.state_slot++; + g_settings.state_slot++; if (g_extern.msg_queue) msg_queue_clear(g_extern.msg_queue); char msg[256]; - snprintf(msg, sizeof(msg), "State slot: %u", g_extern.state_slot); + snprintf(msg, sizeof(msg), "State slot: %u", g_settings.state_slot); if (g_extern.msg_queue) msg_queue_push(g_extern.msg_queue, msg, 1, 180); @@ -2042,15 +2042,15 @@ void rarch_state_slot_increase(void) void rarch_state_slot_decrease(void) { - if (g_extern.state_slot > 0) - g_extern.state_slot--; + if (g_settings.state_slot > 0) + g_settings.state_slot--; if (g_extern.msg_queue) msg_queue_clear(g_extern.msg_queue); char msg[256]; - snprintf(msg, sizeof(msg), "State slot: %u", g_extern.state_slot); + snprintf(msg, sizeof(msg), "State slot: %u", g_settings.state_slot); if (g_extern.msg_queue) msg_queue_push(g_extern.msg_queue, msg, 1, 180); @@ -2188,10 +2188,10 @@ static void movie_record_toggle(void) g_settings.rewind_granularity = 1; char path[PATH_MAX]; - if (g_extern.state_slot > 0) + if (g_settings.state_slot > 0) { snprintf(path, sizeof(path), "%s%u.bsv", - g_extern.bsv.movie_path, g_extern.state_slot); + g_extern.bsv.movie_path, g_settings.state_slot); } else { diff --git a/settings.c b/settings.c index c48d12747d..12b4fe1a68 100644 --- a/settings.c +++ b/settings.c @@ -905,7 +905,7 @@ bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_EXTERN(console.screen.resolutions.current.id, "current_resolution_id"); CONFIG_GET_INT_EXTERN(console.sound.mode, "sound_mode"); #endif - CONFIG_GET_INT_EXTERN(state_slot, "state_slot"); + CONFIG_GET_INT(state_slot, "state_slot"); CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.x, "custom_viewport_x"); CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.y, "custom_viewport_y"); @@ -1467,7 +1467,7 @@ bool config_save_file(const char *path) // g_extern config_set_bool(conf, "config_save_on_exit", g_extern.config_save_on_exit); config_set_int(conf, "sound_mode", g_extern.console.sound.mode); - config_set_int(conf, "state_slot", g_extern.state_slot); + config_set_int(conf, "state_slot", g_settings.state_slot); #ifdef HAVE_NETPLAY config_set_bool(conf, "netplay_spectator_mode_enable", g_extern.netplay_is_spectate); diff --git a/settings_data.c b/settings_data.c index c27e31fc76..98f02ecc25 100644 --- a/settings_data.c +++ b/settings_data.c @@ -796,7 +796,7 @@ static void general_read_handler(const void *data) #endif } else if (!strcmp(setting->name, "state_slot")) - *setting->value.integer = g_extern.state_slot; + *setting->value.integer = g_settings.state_slot; else if (!strcmp(setting->name, "audio_rate_control_delta")) { *setting->value.fraction = g_settings.audio.rate_control_delta; @@ -1092,7 +1092,7 @@ static void general_write_handler(const void *data) rarch_init_dsp_filter(); } else if (!strcmp(setting->name, "state_slot")) - g_extern.state_slot = *setting->value.integer; + g_settings.state_slot = *setting->value.integer; else if (!strcmp(setting->name, "audio_rate_control_delta")) { if (*setting->value.fraction < 0.0005) @@ -1443,7 +1443,7 @@ rarch_setting_t* setting_data_get_list(void) CONFIG_BOOL(g_settings.savestate_auto_index, "savestate_auto_index", "Save State Auto Index", savestate_auto_index, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(g_settings.savestate_auto_save, "savestate_auto_save", "Auto Save State", savestate_auto_save, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(g_settings.savestate_auto_load, "savestate_auto_load", "Auto Load State", savestate_auto_load, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) - CONFIG_INT(g_extern.state_slot, "state_slot", "State Slot", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) + CONFIG_INT(g_settings.state_slot, "state_slot", "State Slot", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) END_SUB_GROUP() START_SUB_GROUP("Miscellaneous") CONFIG_BOOL(g_settings.network_cmd_enable, "network_cmd_enable", "Network Commands", network_cmd_enable, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)