libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 07:03:30 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(RMenu) Remove stub 'Default all' options which were no longer used

Browse Source
This commit is contained in:
twinaphex 2013-06-03 01:18:09 +02:00
parent f03dc4cb62
commit 2b32c4dd9b
3 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/menu/menu_common.c
View File

@ -748,14 +748,14 @@ static uint64_t rgui_input(void)
(1ULL << DEVICE_NAV_RIGHT) |
(1ULL << DEVICE_NAV_UP) |
(1ULL << DEVICE_NAV_DOWN) |
(1ULL << DEVICE_NAV_LEFT_ANALOG_L) |
(1ULL << DEVICE_NAV_RIGHT_ANALOG_L) |
(1ULL << DEVICE_NAV_UP_ANALOG_L) |
(1ULL << DEVICE_NAV_DOWN_ANALOG_L) |
(1ULL << DEVICE_NAV_LEFT_ANALOG_R) |
(1ULL << DEVICE_NAV_RIGHT_ANALOG_R) |
(1ULL << DEVICE_NAV_UP_ANALOG_R) |
(1ULL << DEVICE_NAV_DOWN_ANALOG_R) |
(1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP) |
(1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN) |
(1ULL << RARCH_ANALOG_LEFT_X_DPAD_LEFT) |
(1ULL << RARCH_ANALOG_LEFT_X_DPAD_RIGHT) |
(1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_UP) |
(1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_DOWN) |
(1ULL << RARCH_ANALOG_RIGHT_X_DPAD_LEFT) |
(1ULL << RARCH_ANALOG_RIGHT_X_DPAD_RIGHT) |
(1ULL << DEVICE_NAV_L2) |
(1ULL << DEVICE_NAV_R2)
)) && !(input_state & (1ULL << DEVICE_NAV_MENU));

39
frontend/menu/rmenu.c
View File

@ -1020,11 +1020,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
}
}
break;
case SETTING_DEFAULT_VIDEO_ALL:
if (input & (1ULL << DEVICE_NAV_START))
{
}
break;
case SETTING_SOUND_MODE:
if (input & (1ULL << DEVICE_NAV_LEFT))
{
@ -1066,8 +1061,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
strlcpy(g_settings.audio.device, "0.0.0.0", sizeof(g_settings.audio.device));
break;
#endif
case SETTING_DEFAULT_AUDIO_ALL:
break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
settings_set(1ULL << S_INFO_DEBUG_MSG_TOGGLE);
@ -1211,18 +1204,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if (input & (1ULL << DEVICE_NAV_START))
strlcpy(g_settings.system_directory, default_paths.system_dir, sizeof(g_settings.system_directory));
break;
case SETTING_PATH_DEFAULT_ALL:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)) || (input & (1ULL << DEVICE_NAV_START)))
{
strlcpy(g_settings.rgui_browser_directory, default_paths.filebrowser_startup_dir,
sizeof(g_settings.rgui_browser_directory));
strlcpy(g_extern.savestate_dir, default_paths.port_dir, sizeof(g_extern.savestate_dir));
#ifdef HAVE_XML
strlcpy(g_settings.cheat_database, default_paths.port_dir, sizeof(g_settings.cheat_database));
#endif
strlcpy(g_extern.savefile_dir, "", sizeof(g_extern.savefile_dir));
}
break;
case SETTING_CONTROLS_SCHEME:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)) || (input & (1ULL << DEVICE_NAV_START)))
{
@ -1831,11 +1812,6 @@ static int select_setting(void *data, uint64_t input)
snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "ON" : "OFF");
snprintf(comment, sizeof(comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "INFO - [Triple Buffering] is set to 'ON'." : "INFO - [Triple Buffering] is set to 'OFF'.");
break;
case SETTING_DEFAULT_VIDEO_ALL:
strlcpy(text, "DEFAULTS", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Reset all these settings.", sizeof(comment));
break;
case SETTING_SOUND_MODE:
strlcpy(text, "Sound Output", sizeof(text));
switch(g_extern.console.sound.mode)
@ -1867,12 +1843,6 @@ static int select_setting(void *data, uint64_t input)
strlcpy(comment, "INFO - Enter the IP Address of the [RSound Audio Server]. IP address\nmust be an IPv4 32-bits address, eg: '192.168.1.7'.", sizeof(comment));
break;
#endif
case SETTING_DEFAULT_AUDIO_ALL:
strlcpy(text, "DEFAULTS", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Reset all these settings.", sizeof(comment));
break;
/* emu-specific */
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
strlcpy(text, "Debug Info Messages", sizeof(text));
snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF");
@ -1959,8 +1929,8 @@ static int select_setting(void *data, uint64_t input)
strlcpy(comment, "INFO - Set the default [System directory] path.", sizeof(comment));
break;
case SETTING_CONTROLS_SCHEME:
strlcpy(text, "Control Scheme Preset", sizeof(text));
snprintf(comment, sizeof(comment), "INFO - Input scheme preset [%s] is selected.", g_extern.input_config_path);
strlcpy(text, "Load Controls Preset", sizeof(text));
snprintf(comment, sizeof(comment), "INFO - Controls preset [%s] is selected.", g_extern.input_config_path);
strlcpy(setting_text, g_extern.input_config_path, sizeof(setting_text));
break;
case SETTING_CONTROLS_NUMBER:
@ -2025,11 +1995,6 @@ static int select_setting(void *data, uint64_t input)
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Set all Controls settings to defaults.", sizeof(comment));
break;
case SETTING_PATH_DEFAULT_ALL:
strlcpy(text, "DEFAULTS", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Set all Path settings to defaults.", sizeof(comment));
break;
case INGAME_MENU_LOAD_STATE:
strlcpy(text, "Load State", sizeof(text));
snprintf(setting_text, sizeof(setting_text), "%d", g_extern.state_slot);

33
frontend/menu/rmenu.h
View File

@ -78,7 +78,7 @@ enum
SETTING_EMU_SHOW_DEBUG_INFO_MSG,
SETTING_EMU_SHOW_INFO_MSG,
SETTING_EMU_SKIN,
SETTING_DEFAULT_VIDEO_ALL,
SETTING_EMU_END,
SETTING_SOUND_MODE,
#ifdef HAVE_RSOUND
SETTING_RSOUND_SERVER_IP_ADDRESS,
@ -88,7 +88,7 @@ enum
SETTING_EMU_AUDIO_SOUND_VOLUME_LEVEL,
#endif
SETTING_EMU_AUDIO_MUTE,
SETTING_DEFAULT_AUDIO_ALL,
SETTING_EMU_AUDIO_END,
SETTING_PATH_DEFAULT_ROM_DIRECTORY,
SETTING_PATH_SAVESTATES_DIRECTORY,
SETTING_PATH_SRAM_DIRECTORY,
@ -96,7 +96,7 @@ enum
SETTING_PATH_CHEATS,
#endif
SETTING_PATH_SYSTEM,
SETTING_PATH_DEFAULT_ALL,
SETTING_PATH_END,
SETTING_CONTROLS_SCHEME,
SETTING_CONTROLS_NUMBER,
SETTING_DPAD_EMULATION,
@ -118,7 +118,8 @@ enum
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3,
SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS,
SETTING_CONTROLS_DEFAULT_ALL,
SETTING_LAST,
SETTING_CONTROLS_END,
SETTING_END,
INGAME_MENU_CHANGE_LIBRETRO_CORE,
INGAME_MENU_LOAD_GAME_HISTORY_MODE,
INGAME_MENU_CHANGE_GAME,
@ -138,6 +139,7 @@ enum
INGAME_MENU_RETURN_TO_MULTIMAN,
#endif
INGAME_MENU_QUIT_RETROARCH,
INGAME_MENU_END,
#ifdef HAVE_SHADER_MANAGER
INGAME_MENU_SHADER_OPTIONS_MODE,
#endif
@ -155,6 +157,7 @@ enum
SETTING_ASPECT_RATIO,
SETTING_CUSTOM_VIEWPORT,
SETTING_ROTATION,
SETTING_VIDEO_END,
#ifdef HAVE_SHADER_MANAGER
SHADERMAN_AUTOSTART_CGP_ON_STARTUP,
SHADERMAN_LOAD_CGP,
@ -191,19 +194,19 @@ enum
#endif
#define FIRST_SETTING 0
#define FIRST_VIDEO_SETTING INGAME_MENU_QUIT_RETROARCH+1
#define FIRST_AUDIO_SETTING SETTING_DEFAULT_VIDEO_ALL+1
#define FIRST_PATH_SETTING SETTING_DEFAULT_AUDIO_ALL+1
#define FIRST_CONTROLS_SETTING_PAGE_1 SETTING_PATH_DEFAULT_ALL+1
#define FIRST_VIDEO_SETTING INGAME_MENU_END+1
#define FIRST_AUDIO_SETTING SETTING_EMU_END+1
#define FIRST_PATH_SETTING SETTING_EMU_AUDIO_END+1
#define FIRST_CONTROLS_SETTING_PAGE_1 SETTING_PATH_END+1
#define FIRST_CONTROL_BIND SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B
#define FIRST_INGAME_MENU_SETTING SETTING_LAST+1
#define FIRST_INGAME_MENU_SETTING SETTING_END+1
#define MAX_NO_OF_SETTINGS SETTING_DEFAULT_VIDEO_ALL+1
#define MAX_NO_OF_VIDEO_SETTINGS SETTING_ROTATION+1
#define MAX_NO_OF_AUDIO_SETTINGS SETTING_DEFAULT_AUDIO_ALL+1
#define MAX_NO_OF_PATH_SETTINGS SETTING_PATH_DEFAULT_ALL+1
#define MAX_NO_OF_CONTROLS_SETTINGS SETTING_CONTROLS_DEFAULT_ALL+1
#define MAX_NO_OF_INGAME_MENU_SETTINGS INGAME_MENU_QUIT_RETROARCH+1
#define MAX_NO_OF_SETTINGS SETTING_EMU_END
#define MAX_NO_OF_VIDEO_SETTINGS SETTING_VIDEO_END
#define MAX_NO_OF_AUDIO_SETTINGS SETTING_EMU_AUDIO_END
#define MAX_NO_OF_PATH_SETTINGS SETTING_PATH_END
#define MAX_NO_OF_CONTROLS_SETTINGS SETTING_CONTROLS_END
#define MAX_NO_OF_INGAME_MENU_SETTINGS INGAME_MENU_END
#ifdef HAVE_SHADER_MANAGER
#define FIRST_SHADERMAN_SETTING SHADERMAN_AUTOSTART_CGP_ON_STARTUP