ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use const for config_get_ptr global pointer to signify this pointer 

isn't being written to, only read from
This commit is contained in:
twinaphex 2019-06-26 07:40:47 +02:00
parent 3b634b64fa
commit faa52fb0df
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
command.c
View File

@ -1362,7 +1362,7 @@ static bool command_event_save_auto_state(void)
char *savestate_name_auto = NULL; char *savestate_name_auto = NULL;
size_t size_t
savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char); savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char);
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (!global || !settings || !settings->bools.savestate_auto_save) if (!global || !settings || !settings->bools.savestate_auto_save)
@ -1639,7 +1639,7 @@ static bool command_event_main_state(unsigned cmd)
char msg[128]; char msg[128];
size_t state_path_size = 16384 * sizeof(char); size_t state_path_size = 16384 * sizeof(char);
char *state_path = (char*)malloc(state_path_size); char *state_path = (char*)malloc(state_path_size);
global_t *global = global_get_ptr(); const global_t *global = (const global_t*)global_get_ptr();
bool ret = false; bool ret = false;
bool push_msg = true; bool push_msg = true;
@ -1647,17 +1647,18 @@ static bool command_event_main_state(unsigned cmd)
if (global) if (global)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int state_slot = settings->ints.state_slot; int state_slot = settings->ints.state_slot;
const char *name_savestate = global->name.savestate;
if (state_slot > 0) if (state_slot > 0)
snprintf(state_path, state_path_size, "%s%d", snprintf(state_path, state_path_size, "%s%d",
global->name.savestate, state_slot); name_savestate, state_slot);
else if (state_slot < 0) else if (state_slot < 0)
fill_pathname_join_delim(state_path, fill_pathname_join_delim(state_path,
global->name.savestate, "auto", '.', state_path_size); name_savestate, "auto", '.', state_path_size);
else else
strlcpy(state_path, global->name.savestate, state_path_size); strlcpy(state_path, name_savestate, state_path_size);
} }
core_serialize_size(&info); core_serialize_size(&info);
@ -1843,12 +1844,9 @@ bool command_event(enum event_command cmd, void *data)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
core_info_ctx_find_t info_find; core_info_ctx_find_t info_find;
rarch_system_info_t *system_info = NULL; rarch_system_info_t *system_info = runloop_get_system_info();
struct retro_system_info *system = NULL; struct retro_system_info *system = &system_info->info;
const char *core_path = NULL; const char *core_path = path_get(RARCH_PATH_CORE);
system_info = runloop_get_system_info();
system = &system_info->info;
core_path = path_get(RARCH_PATH_CORE);
#if defined(HAVE_DYNAMIC) #if defined(HAVE_DYNAMIC)
if (string_is_empty(core_path)) if (string_is_empty(core_path))
@ -2186,26 +2184,28 @@ TODO: Add a setting for these tweaks */
if(memory_used > (72 * 1024 * 1024)) if(memory_used > (72 * 1024 * 1024))
break; break;
#endif #endif
settings_t *settings = config_get_ptr();
command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (settings->bools.input_overlay_enable)
{ {
task_push_overlay_load_default(input_overlay_loaded, const settings_t *settings = (const settings_t*)config_get_ptr();
settings->paths.path_overlay, if (settings->bools.input_overlay_enable)
settings->bools.input_overlay_hide_in_menu, {
settings->bools.input_overlay_enable, task_push_overlay_load_default(input_overlay_loaded,
settings->floats.input_overlay_opacity, settings->paths.path_overlay,
settings->floats.input_overlay_scale, settings->bools.input_overlay_hide_in_menu,
NULL); settings->bools.input_overlay_enable,
settings->floats.input_overlay_opacity,
settings->floats.input_overlay_scale,
NULL);
}
} }
#endif #endif
} }
break; break;
case CMD_EVENT_OVERLAY_NEXT: case CMD_EVENT_OVERLAY_NEXT:
{ {
settings_t *settings = config_get_ptr();
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
const settings_t *settings = (const settings_t*)config_get_ptr();
input_overlay_next(overlay_ptr, settings->floats.input_overlay_opacity); input_overlay_next(overlay_ptr, settings->floats.input_overlay_opacity);
#endif #endif
} }
@ -2400,7 +2400,7 @@ TODO: Add a setting for these tweaks */
case CMD_EVENT_OVERLAY_SET_SCALE_FACTOR: case CMD_EVENT_OVERLAY_SET_SCALE_FACTOR:
{ {
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
input_overlay_set_scale_factor(overlay_ptr, settings->floats.input_overlay_scale); input_overlay_set_scale_factor(overlay_ptr, settings->floats.input_overlay_scale);
#endif #endif
} }
@ -2408,7 +2408,7 @@ TODO: Add a setting for these tweaks */
case CMD_EVENT_OVERLAY_SET_ALPHA_MOD: case CMD_EVENT_OVERLAY_SET_ALPHA_MOD:
{ {
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
input_overlay_set_alpha_mod(overlay_ptr, settings->floats.input_overlay_opacity); input_overlay_set_alpha_mod(overlay_ptr, settings->floats.input_overlay_opacity);
#endif #endif
} }
@ -2605,7 +2605,7 @@ TODO: Add a setting for these tweaks */
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_driver_is_alive()) if (menu_driver_is_alive())
{ {
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
if (settings->bools.menu_pause_libretro) if (settings->bools.menu_pause_libretro)
command_event(CMD_EVENT_AUDIO_STOP, NULL); command_event(CMD_EVENT_AUDIO_STOP, NULL);
else else
@ -2613,7 +2613,7 @@ TODO: Add a setting for these tweaks */
} }
else else
{ {
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
if (settings->bools.menu_pause_libretro) if (settings->bools.menu_pause_libretro)
command_event(CMD_EVENT_AUDIO_START, NULL); command_event(CMD_EVENT_AUDIO_START, NULL);
} }
@ -2664,15 +2664,15 @@ TODO: Add a setting for these tweaks */
return false; return false;
} }
/* Disable rewind & sram autosave if it was enabled /* Disable rewind & SRAM autosave if it was enabled
TODO: Add a setting for these tweaks */ * TODO: Add a setting for these tweaks */
state_manager_event_deinit(); state_manager_event_deinit();
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
autosave_deinit(); autosave_deinit();
#endif #endif
} }
break; break;
/* init netplay via lobby when content is loaded */ /* Initialize netplay via lobby when content is loaded */
case CMD_EVENT_NETPLAY_INIT_DIRECT: case CMD_EVENT_NETPLAY_INIT_DIRECT:
{ {
/* buf is expected to be address|port */ /* buf is expected to be address|port */
@ -2714,7 +2714,7 @@ TODO: Add a setting for these tweaks */
{ {
static struct string_list *hostname = NULL; static struct string_list *hostname = NULL;
/* buf is expected to be address|port */ /* buf is expected to be address|port */
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
char *buf = (char *)data; char *buf = (char *)data;
RARCH_LOG("[netplay] buf %s\n", buf); RARCH_LOG("[netplay] buf %s\n", buf);
@ -2739,7 +2739,7 @@ TODO: Add a setting for these tweaks */
string_list_free(hostname); string_list_free(hostname);
/* Disable rewind if it was enabled /* Disable rewind if it was enabled
TODO: Add a setting for these tweaks */ * TODO: Add a setting for these tweaks */
state_manager_event_deinit(); state_manager_event_deinit();
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
autosave_deinit(); autosave_deinit();
@ -2776,17 +2776,19 @@ TODO: Add a setting for these tweaks */
} }
case CMD_EVENT_NETPLAY_DISCONNECT: case CMD_EVENT_NETPLAY_DISCONNECT:
{ {
settings_t *settings = config_get_ptr();
netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL);
netplay_driver_ctl(RARCH_NETPLAY_CTL_DISABLE, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_DISABLE, NULL);
/* Re-enable rewind if it was enabled {
TODO: Add a setting for these tweaks */ const settings_t *settings = (const settings_t*)config_get_ptr();
if (settings->bools.rewind_enable) /* Re-enable rewind if it was enabled
command_event(CMD_EVENT_REWIND_INIT, NULL); * TODO: Add a setting for these tweaks */
if (settings->uints.autosave_interval != 0) if (settings->bools.rewind_enable)
command_event(CMD_EVENT_AUTOSAVE_INIT, NULL); command_event(CMD_EVENT_REWIND_INIT, NULL);
if (settings->uints.autosave_interval != 0)
command_event(CMD_EVENT_AUTOSAVE_INIT, NULL);
}
break; break;
} }
@ -3066,7 +3068,7 @@ TODO: Add a setting for these tweaks */
case CMD_EVENT_DISCORD_INIT: case CMD_EVENT_DISCORD_INIT:
#ifdef HAVE_DISCORD #ifdef HAVE_DISCORD
{ {
settings_t *settings = config_get_ptr(); const settings_t *settings = (const settings_t*)config_get_ptr();
if (!settings->bools.discord_enable) if (!settings->bools.discord_enable)
return false; return false;
@ -3098,12 +3100,11 @@ TODO: Add a setting for these tweaks */
break; break;
case CMD_EVENT_AI_SERVICE_CALL: case CMD_EVENT_AI_SERVICE_CALL:
{
#ifdef HAVE_TRANSLATE #ifdef HAVE_TRANSLATE
RARCH_LOG("AI Service Called...\n"); RARCH_LOG("AI Service Called...\n");
run_translation_service(); run_translation_service();
#endif #endif
} break;
case CMD_EVENT_NONE: case CMD_EVENT_NONE:
return false; return false;
} }