mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of SETTING_DPAD_EMULATION - will be reintroduced later in some

Browse Source 
way
This commit is contained in:
twinaphex 2013-10-06 23:47:48 +00:00
parent 5aecea208e
commit e574881d75
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/menu/menu_common.h
View File

@ -153,7 +153,6 @@ typedef enum
RGUI_SETTINGS_BIND_PLAYER,
RGUI_SETTINGS_BIND_DEVICE,
RGUI_SETTINGS_BIND_DEVICE_TYPE,
RGUI_SETTINGS_BIND_DPAD_EMULATION,
// Match up with libretro order for simplicity.
RGUI_SETTINGS_BIND_BEGIN,

3
frontend/menu/menu_settings.c
View File

@ -1253,9 +1253,6 @@ void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w,
strlcpy(type_str, name, type_str_size);
break;
}
case RGUI_SETTINGS_BIND_DPAD_EMULATION:
strlcpy(type_str, "TODO", type_str_size);
break;
case RGUI_SETTINGS_BIND_UP:
case RGUI_SETTINGS_BIND_DOWN:
case RGUI_SETTINGS_BIND_LEFT:

9
frontend/menu/rgui.c
View File

@ -517,13 +517,8 @@ static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
rgui_list_push(rgui->selection_buf, "Device", RGUI_SETTINGS_BIND_DEVICE, 0);
rgui_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0);
if (driver.input && driver.input->set_keybinds)
rgui_list_push(rgui->selection_buf, "DPad Emulation", RGUI_SETTINGS_BIND_DPAD_EMULATION, 0);
else
{
rgui_list_push(rgui->selection_buf, "Configure All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_ALL, 0); // This doesn't make sense on anything else than PC.
rgui_list_push(rgui->selection_buf, "Default All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0); // This doesn't make sense on anything else than PC.
}
rgui_list_push(rgui->selection_buf, "Configure All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_ALL, 0);
rgui_list_push(rgui->selection_buf, "Default All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0);
if (rgui->current_pad == 0)
rgui_list_push(rgui->selection_buf, "RGUI Menu Toggle", RGUI_SETTINGS_BIND_MENU_TOGGLE, 0);

5
frontend/menu/rmenu.c
View File

@ -780,7 +780,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
case SETTING_REWIND_GRANULARITY:
case SETTING_EMU_AUDIO_MUTE:
case SETTING_CONTROLS_NUMBER:
case SETTING_DPAD_EMULATION:
case INGAME_MENU_LOAD_STATE:
case INGAME_MENU_SAVE_STATE:
case SETTING_ROTATION:
@ -1540,9 +1539,6 @@ static int select_setting(void *data, uint64_t action)
strlcpy(text, "Player", sizeof(text));
menu_set_settings_label(setting_text, sizeof(setting_text), &w, settings_lut[i]);
break;
case SETTING_DPAD_EMULATION:
strlcpy(text, "TODO", sizeof(text));
break;
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_Y:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_SELECT:
@ -2209,7 +2205,6 @@ static void* rgui_init(void)
settings_lut[SETTING_REWIND_GRANULARITY] = RGUI_SETTINGS_REWIND_GRANULARITY;
settings_lut[SETTING_EMU_AUDIO_MUTE] = RGUI_SETTINGS_AUDIO_MUTE;
settings_lut[SETTING_CONTROLS_NUMBER] = RGUI_SETTINGS_BIND_PLAYER;
settings_lut[SETTING_DPAD_EMULATION] = RGUI_SETTINGS_BIND_DPAD_EMULATION;
settings_lut[INGAME_MENU_LOAD_STATE] = RGUI_SETTINGS_SAVESTATE_LOAD;
settings_lut[INGAME_MENU_SAVE_STATE] = RGUI_SETTINGS_SAVESTATE_SAVE;
settings_lut[SETTING_ROTATION] = RGUI_SETTINGS_VIDEO_ROTATION;

1
frontend/menu/rmenu.h
View File

@ -95,7 +95,6 @@ enum
SETTING_PATH_SYSTEM,
SETTING_PATH_END,
SETTING_CONTROLS_NUMBER,
SETTING_DPAD_EMULATION,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_Y,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_SELECT,