mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Move rewind settings to Settings submenu

Browse Source
This commit is contained in:
twinaphex 2013-05-26 00:32:39 +02:00
parent e492425700
commit 20fdda8ca9
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/rmenu.c
View File

@ -1129,7 +1129,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if (input & (1ULL << DEVICE_NAV_START)) if (input & (1ULL << DEVICE_NAV_START))
settings_set(1ULL << S_DEF_INFO_MSG); settings_set(1ULL << S_DEF_INFO_MSG);
break; break;
case INGAME_MENU_REWIND_ENABLED: case SETTING_REWIND_ENABLED:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B))) if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
{ {
settings_set(1ULL << S_REWIND); settings_set(1ULL << S_REWIND);
@ -1149,7 +1149,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
} }
} }
break; break;
case INGAME_MENU_REWIND_GRANULARITY: case SETTING_REWIND_GRANULARITY:
if (input & (1ULL << DEVICE_NAV_LEFT)) if (input & (1ULL << DEVICE_NAV_LEFT))
{ {
if (g_settings.rewind_granularity > 1) if (g_settings.rewind_granularity > 1)
@ -1937,7 +1937,7 @@ static int select_setting(void *data, uint64_t input)
snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? "ON" : "OFF"); snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? "ON" : "OFF");
strlcpy(comment, "INFO - Show onscreen info messages in the menu.", sizeof(comment)); strlcpy(comment, "INFO - Show onscreen info messages in the menu.", sizeof(comment));
break; break;
case INGAME_MENU_REWIND_ENABLED: case SETTING_REWIND_ENABLED:
strlcpy(text, "Rewind", sizeof(text)); strlcpy(text, "Rewind", sizeof(text));
if (g_settings.rewind_enable) if (g_settings.rewind_enable)
{ {
@ -1952,7 +1952,7 @@ static int select_setting(void *data, uint64_t input)
sizeof(comment)); sizeof(comment));
} }
break; break;
case INGAME_MENU_REWIND_GRANULARITY: case SETTING_REWIND_GRANULARITY:
strlcpy(text, "Rewind Granularity", sizeof(text)); strlcpy(text, "Rewind Granularity", sizeof(text));
snprintf(setting_text, sizeof(setting_text), "%d", g_settings.rewind_granularity); snprintf(setting_text, sizeof(setting_text), "%d", g_settings.rewind_granularity);
strlcpy(comment, "INFO - Set the amount of frames to 'rewind'.", sizeof(comment)); strlcpy(comment, "INFO - Set the amount of frames to 'rewind'.", sizeof(comment));

4
frontend/menu/rmenu.h
View File

@ -72,6 +72,8 @@ enum
#ifndef HAVE_RMENU_XUI #ifndef HAVE_RMENU_XUI
enum enum
{ {
SETTING_REWIND_ENABLED,
SETTING_REWIND_GRANULARITY,
SETTING_FONT_SIZE, SETTING_FONT_SIZE,
SETTING_EMU_SHOW_DEBUG_INFO_MSG, SETTING_EMU_SHOW_DEBUG_INFO_MSG,
SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SHOW_INFO_MSG,
@ -131,8 +133,6 @@ enum
INGAME_MENU_SCREENSHOT_MODE, INGAME_MENU_SCREENSHOT_MODE,
INGAME_MENU_RETURN_TO_GAME, INGAME_MENU_RETURN_TO_GAME,
INGAME_MENU_RESET, INGAME_MENU_RESET,
INGAME_MENU_REWIND_ENABLED,
INGAME_MENU_REWIND_GRANULARITY,
INGAME_MENU_FRAME_ADVANCE, INGAME_MENU_FRAME_ADVANCE,
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
INGAME_MENU_RETURN_TO_MULTIMAN, INGAME_MENU_RETURN_TO_MULTIMAN,

2
gfx/gl.c
View File

@ -1142,8 +1142,10 @@ static void gl_init_textures(void *data, const video_info_t *video)
#endif #endif
GLenum internal_fmt = gl->internal_fmt; GLenum internal_fmt = gl->internal_fmt;
#ifndef HAVE_PSGL
GLenum texture_type = gl->texture_type; GLenum texture_type = gl->texture_type;
GLenum texture_fmt = gl->texture_fmt; GLenum texture_fmt = gl->texture_fmt;
#endif
// GLES is picky about which format we use here. // GLES is picky about which format we use here.
// Without extensions, we can *only* render to 16-bit FBOs. // Without extensions, we can *only* render to 16-bit FBOs.