libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 02:00:41 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Create RARCH_OVERRIDE_SETTING_VERBOSITY

Browse Source
This commit is contained in:
twinaphex 2016-08-01 20:54:16 +02:00
parent 01de39bf0b
commit ef7ce5beee
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.c
View File

@ -1567,7 +1567,7 @@ static bool config_load_file(const char *path, bool set_defaults)
if (config_get_bool(conf, "custom_bgm_enable", &tmp_bool))
global->console.sound.system_bgm_enable = tmp_bool;
#endif
if (!global->has_set.verbosity)
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY))
{
if (config_get_bool(conf, "log_verbosity", &tmp_bool))
{

6
menu/menu_setting.c
View File

@ -61,6 +61,7 @@
#include "../config.def.h"
#include "../performance_counters.h"
#include "../lakka.h"
#include "../retroarch.h"
#include "../tasks/tasks_internal.h"
@ -3464,7 +3465,10 @@ void general_write_handler(void *data)
else
verbosity_disable();
global->has_set.verbosity = *setting->value.target.boolean;
if (*setting->value.target.boolean)
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY);
else
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY);
}
break;
case MENU_ENUM_LABEL_VIDEO_SMOOTH:

18
retroarch.c
View File

@ -711,7 +711,6 @@ static void retroarch_parse_input(int argc, char *argv[])
global->has_set.save_path = false;
global->has_set.state_path = false;
global->has_set.libretro_directory = false;
global->has_set.verbosity = false;
global->has_set.netplay_mode = false;
@ -819,10 +818,8 @@ static void retroarch_parse_input(int argc, char *argv[])
break;
case 'v':
{
verbosity_enable();
global->has_set.verbosity = true;
}
verbosity_enable();
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY);
break;
case 'N':
@ -1626,12 +1623,15 @@ void retroarch_fill_pathnames(void)
sizeof(global->name.ips));
}
static bool has_set_libretro = false;
static bool has_set_verbosity = false;
static bool has_set_libretro = false;
bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx)
{
switch (enum_idx)
{
case RARCH_OVERRIDE_SETTING_VERBOSITY:
return has_set_verbosity;
case RARCH_OVERRIDE_SETTING_LIBRETRO:
return has_set_libretro;
case RARCH_OVERRIDE_SETTING_NONE:
@ -1646,6 +1646,9 @@ void retroarch_override_setting_set(enum rarch_override_setting enum_idx)
{
switch (enum_idx)
{
case RARCH_OVERRIDE_SETTING_VERBOSITY:
has_set_verbosity = true;
break;
case RARCH_OVERRIDE_SETTING_LIBRETRO:
has_set_libretro = true;
break;
@ -1659,6 +1662,9 @@ void retroarch_override_setting_unset(enum rarch_override_setting enum_idx)
{
switch (enum_idx)
{
case RARCH_OVERRIDE_SETTING_VERBOSITY:
has_set_verbosity = false;
break;
case RARCH_OVERRIDE_SETTING_LIBRETRO:
has_set_libretro = false;
break;

1
retroarch.h
View File

@ -102,6 +102,7 @@ enum rarch_override_setting
{
RARCH_OVERRIDE_SETTING_NONE = 0,
RARCH_OVERRIDE_SETTING_LIBRETRO,
RARCH_OVERRIDE_SETTING_VERBOSITY,
RARCH_OVERRIDE_SETTING_LAST
};

1
runloop.h
View File

@ -181,7 +181,6 @@ typedef struct global
{
bool save_path;
bool state_path;
bool verbosity;
bool libretro_device[MAX_USERS];
bool libretro_directory;

2
tasks/task_content.c
View File

@ -1554,7 +1554,7 @@ static void menu_content_environment_get(int *argc, char *argv[],
wrap_args->no_content = menu_driver_ctl(
RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL);
if (!global->has_set.verbosity)
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY))
wrap_args->verbose = verbosity_is_enabled();
wrap_args->touched = true;