libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

More g_settings manipulation moved over to set_settings

Browse Source
This commit is contained in:
twinaphex 2013-09-19 12:24:12 +02:00
parent 81280896ed
commit 1fc1014448
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/menu/rgui.c
View File

@ -975,14 +975,11 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
#endif #endif
case RGUI_SETTINGS_REWIND_GRANULARITY: case RGUI_SETTINGS_REWIND_GRANULARITY:
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_RIGHT) if (action == RGUI_ACTION_OK || action == RGUI_ACTION_RIGHT)
g_settings.rewind_granularity++; settings_set(1ULL << S_REWIND_GRANULARITY_INCREMENT);
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
{ settings_set(1ULL << S_REWIND_GRANULARITY_DECREMENT);
if (g_settings.rewind_granularity > 1)
g_settings.rewind_granularity--;
}
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
g_settings.rewind_granularity = 1; settings_set(1ULL << S_DEF_REWIND_GRANULARITY);
break; break;
case RGUI_SETTINGS_CONFIG_SAVE_ON_EXIT: case RGUI_SETTINGS_CONFIG_SAVE_ON_EXIT:
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_RIGHT if (action == RGUI_ACTION_OK || action == RGUI_ACTION_RIGHT

3
general.h
View File

@ -657,6 +657,9 @@ enum
S_INPUT_OVERLAY_SCALE_DECREMENT, S_INPUT_OVERLAY_SCALE_DECREMENT,
S_INPUT_OVERLAY_SCALE_INCREMENT, S_INPUT_OVERLAY_SCALE_INCREMENT,
S_VIDEO_VSYNC_TOGGLE, S_VIDEO_VSYNC_TOGGLE,
S_REWIND_GRANULARITY_DECREMENT,
S_REWIND_GRANULARITY_INCREMENT,
S_DEF_REWIND_GRANULARITY,
S_DEF_ASPECT_RATIO, S_DEF_ASPECT_RATIO,
S_DEF_VIDEO_VSYNC, S_DEF_VIDEO_VSYNC,
S_DEF_INPUT_OVERLAY_OPACITY, S_DEF_INPUT_OVERLAY_OPACITY,

12
settings.c
View File

@ -1172,6 +1172,18 @@ void settings_set(uint64_t settings)
g_settings.input.overlay_opacity = 1.0f; g_settings.input.overlay_opacity = 1.0f;
#endif #endif
if (settings & (1ULL << S_REWIND_GRANULARITY_INCREMENT))
g_settings.rewind_granularity++;
if (settings & (1ULL << S_REWIND_GRANULARITY_DECREMENT))
{
if (g_settings.rewind_granularity > 1)
g_settings.rewind_granularity--;
}
if (settings & (1ULL << S_DEF_REWIND_GRANULARITY))
g_settings.rewind_granularity = 1;
if (settings & (1ULL << S_VIDEO_VSYNC_TOGGLE)) if (settings & (1ULL << S_VIDEO_VSYNC_TOGGLE))
g_settings.video.vsync = !g_settings.video.vsync; g_settings.video.vsync = !g_settings.video.vsync;