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

Cleanups

This commit is contained in:
twinaphex 2016-08-29 21:10:25 +02:00
parent 82581c8461
commit 876ce5ad67
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configuration.c
View File

@ -686,7 +686,7 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti
SETTING_BOOL("video_force_aspect", &settings->video.force_aspect, true, force_aspect); SETTING_BOOL("video_force_aspect", &settings->video.force_aspect, true, force_aspect);
SETTING_BOOL("video_threaded", &settings->video.threaded, true, video_threaded); SETTING_BOOL("video_threaded", &settings->video.threaded, true, video_threaded);
SETTING_BOOL("video_shared_context", &settings->video.shared_context, true, video_shared_context); SETTING_BOOL("video_shared_context", &settings->video.shared_context, true, video_shared_context);
SETTING_BOOL("custom_bgm_enable", &global->console.sound.system_bgm_enable, false, false /* TODO */); SETTING_BOOL("custom_bgm_enable", &global->console.sound.system_bgm_enable, true, false);
SETTING_BOOL("auto_screenshot_filename", &settings->auto_screenshot_filename, true, auto_screenshot_filename); SETTING_BOOL("auto_screenshot_filename", &settings->auto_screenshot_filename, true, auto_screenshot_filename);
SETTING_BOOL("video_force_srgb_disable", &settings->video.force_srgb_disable, true, false); SETTING_BOOL("video_force_srgb_disable", &settings->video.force_srgb_disable, true, false);
SETTING_BOOL("video_fullscreen", &settings->video.fullscreen, true, fullscreen); SETTING_BOOL("video_fullscreen", &settings->video.fullscreen, true, fullscreen);
@ -1211,8 +1211,6 @@ static void config_set_defaults(void)
settings->user_language = RETRO_LANGUAGE_ENGLISH; settings->user_language = RETRO_LANGUAGE_ENGLISH;
#endif #endif
global->console.sound.system_bgm_enable = false;
video_driver_default_settings(); video_driver_default_settings();
if (!string_is_empty(g_defaults.dir.wallpapers)) if (!string_is_empty(g_defaults.dir.wallpapers))
@ -1767,12 +1765,6 @@ static bool config_load_file(const char *path, bool set_defaults,
if (config_get_bool(conf, tmp, &tmp_bool)) if (config_get_bool(conf, tmp, &tmp_bool))
settings->network_remote_enable_user[i] = tmp_bool; settings->network_remote_enable_user[i] = tmp_bool;
} }
#endif
#ifdef RARCH_CONSOLE
/* TODO - will be refactored later to make it more clean - it's more
* important that it works for consoles right now */
if (config_get_bool(conf, "custom_bgm_enable", &tmp_bool))
global->console.sound.system_bgm_enable = tmp_bool;
#endif #endif
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY)) if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY))
{ {