From bbe0f00059d2a60b0e9a31b181186774bd4e5b0b Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 15 Aug 2012 21:00:23 +0200 Subject: [PATCH] (GX) Should save soft_display_filter to config file now (CONSOLE) throttle mode will not be enabled if force_nonblock is set to true --- console/rarch_console_config.c | 4 ++-- console/rarch_console_settings.c | 6 ++++-- retroarch.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/console/rarch_console_config.c b/console/rarch_console_config.c index a6b9ea8ec6..8182cdc642 100644 --- a/console/rarch_console_config.c +++ b/console/rarch_console_config.c @@ -103,8 +103,8 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c CONFIG_GET_BOOL_CONSOLE(gamma_correction, "gamma_correction"); #ifdef _XBOX1 CONFIG_GET_INT_CONSOLE(flicker_filter, "fliker_filter"); - CONFIG_GET_BOOL_CONSOLE(soft_display_filter_enable, "soft_display_filter_enable"); #endif + CONFIG_GET_BOOL_CONSOLE(soft_display_filter_enable, "soft_display_filter_enable"); CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir"); CONFIG_GET_FLOAT_CONSOLE(menu_font_size, "menu_font_size"); CONFIG_GET_FLOAT_CONSOLE(overscan_amount, "overscan_amount"); @@ -160,8 +160,8 @@ void rarch_config_save(const char * conf_name) #ifdef _XBOX360 config_set_int(conf, "color_format", g_console.color_format); #endif -#ifdef _XBOX1 config_set_bool(conf, "soft_display_filter_enable", g_console.soft_display_filter_enable); +#ifdef _XBOX1 config_set_int(conf, "flicker_filter", g_console.flicker_filter); #endif config_set_bool(conf, "throttle_enable", g_console.throttle_enable); diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c index b2e6f8f163..5d77ad8947 100644 --- a/console/rarch_console_settings.c +++ b/console/rarch_console_settings.c @@ -148,7 +148,8 @@ void rarch_settings_change(unsigned setting) g_settings.video.fbo_scale_y += 1.0f; break; case S_THROTTLE: - g_console.throttle_enable = !g_console.throttle_enable; + if(!g_extern.system.force_nonblock) + g_console.throttle_enable = !g_console.throttle_enable; break; case S_TRIPLE_BUFFERING: g_console.triple_buffering_enable = !g_console.triple_buffering_enable; @@ -189,7 +190,8 @@ void rarch_settings_default(unsigned setting) g_console.screen_orientation = ORIENTATION_NORMAL; break; case S_DEF_THROTTLE: - g_console.throttle_enable = true; + if(!g_extern.system.force_nonblock) + g_console.throttle_enable = true; break; case S_DEF_TRIPLE_BUFFERING: g_console.triple_buffering_enable = true; diff --git a/retroarch.c b/retroarch.c index f3e3d2b601..f25b87499e 100644 --- a/retroarch.c +++ b/retroarch.c @@ -72,6 +72,7 @@ static void set_fast_forward_button(bool new_button_state, bool new_hold_button_ if (update_sync) { + RARCH_LOG("Video active = %u, VSync = %u, Force nonblock = %u\n", g_extern.video_active, g_settings.video.vsync, g_extern.system.force_nonblock); // Only apply non-block-state for video if we're using vsync. if (g_extern.video_active && g_settings.video.vsync && !g_extern.system.force_nonblock) video_set_nonblock_state_func(syncing_state);