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

Simplify some code

Browse Source
This commit is contained in:
twinaphex 2018-09-29 15:30:46 +02:00
parent 78fea999a7
commit dbf7e89a87
1 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
menu/menu_setting.c
View File

@ -860,25 +860,15 @@ static int setting_action_left_analog_dpad_mode(rarch_setting_t *setting, bool w
return 0; return 0;
} }
static int setting_action_left_libretro_device_type( static unsigned libretro_device_get_size(unsigned *devices, size_t devices_size, unsigned port)
rarch_setting_t *setting, bool wraparound)
{ {
retro_ctx_controller_info_t pad; unsigned types = 0;
unsigned current_device, current_idx, i, devices[128],
types = 0, port = 0;
const struct retro_controller_info *desc = NULL; const struct retro_controller_info *desc = NULL;
rarch_system_info_t *system = NULL; rarch_system_info_t *system = runloop_get_system_info();
if (!setting)
return -1;
port = setting->index_offset;
devices[types++] = RETRO_DEVICE_NONE; devices[types++] = RETRO_DEVICE_NONE;
devices[types++] = RETRO_DEVICE_JOYPAD; devices[types++] = RETRO_DEVICE_JOYPAD;
system = runloop_get_system_info();
if (system) if (system)
{ {
/* Only push RETRO_DEVICE_ANALOG as default if we use an /* Only push RETRO_DEVICE_ANALOG as default if we use an
@ -892,16 +882,32 @@ static int setting_action_left_libretro_device_type(
if (desc) if (desc)
{ {
unsigned i;
for (i = 0; i < desc->num_types; i++) for (i = 0; i < desc->num_types; i++)
{ {
unsigned id = desc->types[i].id; unsigned id = desc->types[i].id;
if (types < ARRAY_SIZE(devices) && if (types < devices_size &&
id != RETRO_DEVICE_NONE && id != RETRO_DEVICE_NONE &&
id != RETRO_DEVICE_JOYPAD) id != RETRO_DEVICE_JOYPAD)
devices[types++] = id; devices[types++] = id;
} }
} }
return types;
}
static int setting_action_left_libretro_device_type(
rarch_setting_t *setting, bool wraparound)
{
retro_ctx_controller_info_t pad;
unsigned current_device, current_idx, i, devices[128],
types = 0, port = 0;
if (!setting)
return -1;
port = setting->index_offset;
types = libretro_device_get_size(devices, ARRAY_SIZE(devices), port);
current_device = input_config_get_device(port); current_device = input_config_get_device(port);
current_idx = 0; current_idx = 0;
for (i = 0; i < types; i++) for (i = 0; i < types; i++)
@ -2372,40 +2378,12 @@ static int setting_action_right_libretro_device_type(
retro_ctx_controller_info_t pad; retro_ctx_controller_info_t pad;
unsigned current_device, current_idx, i, devices[128], unsigned current_device, current_idx, i, devices[128],
types = 0, port = 0; types = 0, port = 0;
const struct retro_controller_info *desc = NULL;
rarch_system_info_t *system = runloop_get_system_info();
if (!setting) if (!setting)
return -1; return -1;
port = setting->index_offset; port = setting->index_offset;
types = libretro_device_get_size(devices, ARRAY_SIZE(devices), port);
devices[types++] = RETRO_DEVICE_NONE;
devices[types++] = RETRO_DEVICE_JOYPAD;
if (system)
{
/* Only push RETRO_DEVICE_ANALOG as default if we use an
* older core which doesn't use SET_CONTROLLER_INFO. */
if (!system->ports.size)
devices[types++] = RETRO_DEVICE_ANALOG;
if (port < system->ports.size)
desc = &system->ports.data[port];
}
if (desc)
{
for (i = 0; i < desc->num_types; i++)
{
unsigned id = desc->types[i].id;
if (types < ARRAY_SIZE(devices) &&
id != RETRO_DEVICE_NONE &&
id != RETRO_DEVICE_JOYPAD)
devices[types++] = id;
}
}
current_device = input_config_get_device(port); current_device = input_config_get_device(port);
current_idx = 0; current_idx = 0;
for (i = 0; i < types; i++) for (i = 0; i < types; i++)