diff --git a/configuration.c b/configuration.c index 770cb8d573..4f6ee0cc2d 100644 --- a/configuration.c +++ b/configuration.c @@ -1185,6 +1185,7 @@ static bool config_load_file(const char *path, bool set_defaults) config_file_t *conf = NULL; settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); + bool *verbose = retro_main_verbosity(); if (path) { @@ -1216,7 +1217,7 @@ static bool config_load_file(const char *path, bool set_defaults) extra_path = strtok_r(NULL, "|", &save); } #if 0 - if (global->verbosity) + if (*verbose) { RARCH_LOG_OUTPUT("=== Config ===\n"); config_file_dump_all(conf); @@ -1541,7 +1542,6 @@ static bool config_load_file(const char *path, bool set_defaults) { if (config_get_bool(conf, "log_verbosity", &tmp_bool)) { - bool *verbose = retro_main_verbosity(); if (verbose) *verbose = tmp_bool; } diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 66963f995e..9a097b163b 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -109,7 +109,8 @@ static void frontend_ctr_deinit(void *data) (void)data; #ifndef IS_SALAMANDER global_t *global = global_get_ptr(); - global->verbosity = true; + bool *verbose = retro_main_verbosity(); + *verbose = true; #ifdef HAVE_FILE_LOGGER if (global->log_file) @@ -199,7 +200,9 @@ static void frontend_ctr_init(void *data) #ifndef IS_SALAMANDER (void)data; global_t *global = global_get_ptr(); - global->verbosity = true; + bool *verbose = retro_main_verbosity(); + + *verbose = true; #if 0 APT_SetAppCpuTimeLimit(NULL, 80); diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index 836957c76d..2e39db7912 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -97,9 +97,10 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[], void *args, void *params_data) { #ifndef IS_SALAMANDER - global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; - global->verbosity = true; + global_t *global = global_get_ptr(); + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; + *verbose = true; #endif (void)args; @@ -233,7 +234,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[], } #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif } @@ -361,9 +362,10 @@ static void frontend_ps3_exec(const char *path, bool should_load_game) #ifndef IS_SALAMANDER char *fullpath = NULL; global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; - global->verbosity = true; + *verbose = true; #endif (void)should_load_game; @@ -399,7 +401,7 @@ static void frontend_ps3_exec(const char *path, bool should_load_game) cellSysmoduleUnloadModule(CELL_SYSMODULE_NET); #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif } @@ -409,9 +411,11 @@ static void frontend_ps3_exitspawn(char *core_path, size_t core_path_size) bool should_load_game = false; #ifndef IS_SALAMANDER - global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; - global->verbosity = true; + global_t *global = global_get_ptr(); + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; + + *verbose = true; should_load_game = exitspawn_start_game; @@ -434,7 +438,7 @@ static void frontend_ps3_exitspawn(char *core_path, size_t core_path_size) #endif #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif #endif } diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 2176c397eb..29b7fb7d23 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -164,8 +164,10 @@ static void frontend_psp_deinit(void *data) { (void)data; #ifndef IS_SALAMANDER + bool *verbose = retro_main_verbosity(); global_t *global = global_get_ptr(); - global->verbosity = false; + + *verbose = false; #ifdef HAVE_FILE_LOGGER if (global->log_file) diff --git a/frontend/drivers/platform_wii.c b/frontend/drivers/platform_wii.c index aeb1fc54c7..8d2e77cf12 100644 --- a/frontend/drivers/platform_wii.c +++ b/frontend/drivers/platform_wii.c @@ -122,8 +122,9 @@ void system_exec_wii(const char *_path, bool should_load_game) char game_path[PATH_MAX_LENGTH]; #ifndef IS_SALAMANDER global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; - global->verbosity = true; + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; + *verbose = true; #endif /* copy heap info into stack so it survives @@ -189,6 +190,6 @@ void system_exec_wii(const char *_path, bool should_load_game) exit: (void)0; #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif } diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp index 05d57b0e18..9b632a11f6 100644 --- a/frontend/drivers/platform_xdk.cpp +++ b/frontend/drivers/platform_xdk.cpp @@ -74,8 +74,9 @@ static HRESULT xbox_io_mount(char *szDrive, char *szDevice) { #ifndef IS_SALAMANDER global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; - global->verbosity = true; + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; + *verbose = true; #endif char szSourceDevice[48] = {0}; char szDestinationDrive[16] = {0}; @@ -102,7 +103,7 @@ static HRESULT xbox_io_mount(char *szDrive, char *szDevice) IoCreateSymbolicLink(&LinkName, &DeviceName); #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif return S_OK; } @@ -135,9 +136,10 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[], #ifndef IS_SALAMANDER global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; - global->verbosity = true; + *verbose = true; #endif #ifndef IS_SALAMANDER @@ -269,7 +271,7 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[], #ifndef IS_SALAMANDER exit: - global->verbosity = original_verbose; + *verbose = original_verbose; #endif } @@ -310,9 +312,10 @@ static void frontend_xdk_exitspawn(char *s, size_t len) static void frontend_xdk_exec(const char *path, bool should_load_game) { #ifndef IS_SALAMANDER - global_t *global = global_get_ptr(); - bool original_verbose = global->verbosity; - global->verbosity = true; + global_t *global = global_get_ptr(); + bool *verbose = retro_main_verbosity(); + bool original_verbose = *verbose; + *verbose = true; #endif (void)should_load_game; @@ -349,7 +352,7 @@ static void frontend_xdk_exec(const char *path, bool should_load_game) #endif #endif #ifndef IS_SALAMANDER - global->verbosity = original_verbose; + *verbose = original_verbose; #endif }