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

(menu_setting.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2021-04-14 02:26:20 +02:00
parent 9a994eb777
commit 5ae5463f52
1 changed files with 42 additions and 44 deletions

86
menu/menu_setting.c

@ -643,22 +643,23 @@ static float recalc_step_based_on_length_of_action(rarch_setting_t *setting)
float step = setting->step; float step = setting->step;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if ( global ) if (global)
{ {
if ( global->menu.action_press_time > _21_SECONDS) retro_time_t action_press_time = global->menu.action_press_time;
step = setting->step*1000000.0f; if (action_press_time > _21_SECONDS)
else if ( global->menu.action_press_time > _18_SECONDS) step = setting->step * 1000000.0f;
step = setting->step*100000.0f; else if (action_press_time > _18_SECONDS)
else if ( global->menu.action_press_time > _15_SECONDS) step = setting->step * 100000.0f;
step = setting->step*10000.0f; else if (action_press_time > _15_SECONDS)
else if ( global->menu.action_press_time > _12_SECONDS) step = setting->step * 10000.0f;
step = setting->step*1000.0f; else if (action_press_time > _12_SECONDS)
else if ( global->menu.action_press_time > _9_SECONDS) step = setting->step * 1000.0f;
step = setting->step*100.0f; else if (action_press_time > _9_SECONDS)
else if ( global->menu.action_press_time > _6_SECONDS) step = setting->step * 100.0f;
step = setting->step*10.0f; else if (action_press_time > _6_SECONDS)
else if ( global->menu.action_press_time > _3_SECONDS) step = setting->step * 10.0f;
step = setting->step*5.0f; else if (action_press_time > _3_SECONDS)
step = setting->step * 5.0f;
else else
step = setting->step; step = setting->step;
} }
@ -3373,24 +3374,19 @@ static void setting_set_string_representation_timedate_date_seperator(char *s)
unsigned menu_timedate_date_separator = settings ? unsigned menu_timedate_date_separator = settings ?
settings->uints.menu_timedate_date_separator : settings->uints.menu_timedate_date_separator :
MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN; MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN;
char separator_char;
switch (menu_timedate_date_separator) switch (menu_timedate_date_separator)
{ {
case MENU_TIMEDATE_DATE_SEPARATOR_SLASH: case MENU_TIMEDATE_DATE_SEPARATOR_SLASH:
separator_char = '/'; string_replace_all_chars(s, '-', '/');
break; break;
case MENU_TIMEDATE_DATE_SEPARATOR_PERIOD: case MENU_TIMEDATE_DATE_SEPARATOR_PERIOD:
separator_char = '.'; string_replace_all_chars(s, '-', '.');
break; break;
case MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN: case MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN:
default: default:
separator_char = '-';
break; break;
} }
if (separator_char != '-')
string_replace_all_chars(s, '-', separator_char);
} }
static void setting_get_string_representation_uint_menu_timedate_style( static void setting_get_string_representation_uint_menu_timedate_style(
@ -4755,11 +4751,7 @@ static void setting_get_string_representation_uint_notification_show_screenshot_
break; break;
} }
} }
#endif
#endif
#ifdef HAVE_SCREENSHOTS
#ifdef HAVE_GFX_WIDGETS
static void setting_get_string_representation_uint_notification_show_screenshot_flash( static void setting_get_string_representation_uint_notification_show_screenshot_flash(
rarch_setting_t *setting, rarch_setting_t *setting,
char *s, size_t len) char *s, size_t len)
@ -4833,11 +4825,11 @@ static void setting_get_string_representation_uint_custom_viewport_height(rarch_
av_info = video_viewport_get_system_av_info(); av_info = video_viewport_get_system_av_info();
geom = (struct retro_game_geometry*)&av_info->geometry; geom = (struct retro_game_geometry*)&av_info->geometry;
if (!(rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_height == 0)) if (!(rotation % 2) && (*setting->value.target.unsigned_integer % geom->base_height == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_height); *setting->value.target.unsigned_integer / geom->base_height);
else if ((rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_width == 0)) else if ((rotation % 2) && (*setting->value.target.unsigned_integer % geom->base_width == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_width); *setting->value.target.unsigned_integer / geom->base_width);
@ -5177,6 +5169,7 @@ static void setting_get_string_representation_uint_video_dingux_ipu_filter_type(
break; break;
} }
} }
#if defined(DINGUX_BETA) #if defined(DINGUX_BETA)
static void setting_get_string_representation_uint_video_dingux_refresh_rate( static void setting_get_string_representation_uint_video_dingux_refresh_rate(
rarch_setting_t *setting, rarch_setting_t *setting,
@ -5238,26 +5231,28 @@ static void setting_get_string_representation_uint_input_auto_game_focus(
* Can prevent the user from locking him/herself out of the program. */ * Can prevent the user from locking him/herself out of the program. */
static bool setting_is_protected_driver(rarch_setting_t *setting) static bool setting_is_protected_driver(rarch_setting_t *setting)
{ {
if (!setting) if (setting)
return false;
switch (setting->enum_idx)
{ {
case MENU_ENUM_LABEL_INPUT_DRIVER: switch (setting->enum_idx)
case MENU_ENUM_LABEL_JOYPAD_DRIVER: {
case MENU_ENUM_LABEL_VIDEO_DRIVER: case MENU_ENUM_LABEL_INPUT_DRIVER:
case MENU_ENUM_LABEL_MENU_DRIVER: case MENU_ENUM_LABEL_JOYPAD_DRIVER:
return true; case MENU_ENUM_LABEL_VIDEO_DRIVER:
default: case MENU_ENUM_LABEL_MENU_DRIVER:
return false; return true;
default:
break;
}
} }
return false;
} }
static int setting_action_left_analog_dpad_mode( static int setting_action_left_analog_dpad_mode(
rarch_setting_t *setting, size_t idx, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned port = 0; unsigned port = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting) if (!setting)
return -1; return -1;
@ -5400,15 +5395,18 @@ static int setting_action_left_bind_device(
static int setting_action_left_mouse_index( static int setting_action_left_mouse_index(
rarch_setting_t *setting, size_t idx, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned index_offset = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting) if (!setting)
return -1; return -1;
if (settings->uints.input_mouse_index[setting->index_offset]) index_offset = setting->index_offset;
--settings->uints.input_mouse_index[setting->index_offset];
if (settings->uints.input_mouse_index[index_offset])
--settings->uints.input_mouse_index[index_offset];
else else
settings->uints.input_mouse_index[setting->index_offset] = MAX_USERS - 1; settings->uints.input_mouse_index[index_offset] = MAX_USERS - 1;
settings->modified = true; settings->modified = true;
return 0; return 0;