From fd6f44870995db4ce2ac8142a46bcc8ec43b8d33 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Nov 2016 08:33:36 +0100 Subject: [PATCH] Cleanups --- intl/msg_hash_us.h | 16 ++++++++++++++++ menu/cbs/menu_cbs_sublabel.c | 17 ++++++++++++++++- msg_hash.h | 24 ++++++++++++++++-------- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index f0baec63ef..7ca9cb9a69 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2118,3 +2118,19 @@ MSG_HASH( MENU_ENUM_SUBLABEL_AUDIO_SYNC, "Synchronize audio. Recommended." ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD, + "How far an axis must be tilted to result in a button press." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT, + "Amount of seconds to wait until proceeding to the next bind." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD, + "Describes the period of which turbo-enabled buttons toggle. Numbers are described in frames." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE, + "Describes how long the period of a turbo-enabled button should be. Numbers are described in frames." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 7a26c27cb5..0e5233b655 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -91,9 +91,12 @@ default_sublabel_macro(action_bind_sublabel_location_allow, MENU_ default_sublabel_macro(action_bind_sublabel_input_max_users, MENU_ENUM_SUBLABEL_INPUT_MAX_USERS) default_sublabel_macro(action_bind_sublabel_input_poll_type_behavior, MENU_ENUM_SUBLABEL_INPUT_POLL_TYPE_BEHAVIOR) default_sublabel_macro(action_bind_sublabel_input_all_users_control_menu, MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU) +default_sublabel_macro(action_bind_sublabel_input_bind_timeout, MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT) default_sublabel_macro(action_bind_sublabel_audio_volume, MENU_ENUM_SUBLABEL_AUDIO_VOLUME) default_sublabel_macro(action_bind_sublabel_audio_sync, MENU_ENUM_SUBLABEL_AUDIO_SYNC) - +default_sublabel_macro(action_bind_sublabel_axis_threshold, MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD) +default_sublabel_macro(action_bind_sublabel_input_turbo_period, MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD) +default_sublabel_macro(action_bind_sublabel_input_duty_cycle, MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -135,6 +138,18 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_INPUT_DUTY_CYCLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_duty_cycle); + break; + case MENU_ENUM_LABEL_INPUT_TURBO_PERIOD: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_turbo_period); + break; + case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_bind_timeout); + break; + case MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_axis_threshold); + break; case MENU_ENUM_LABEL_AUDIO_SYNC: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_sync); break; diff --git a/msg_hash.h b/msg_hash.h index db1809b7a7..f1fd810b3a 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -436,6 +436,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS, + MENU_ENUM_LABEL_INPUT_TURBO_PERIOD, + MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD, + MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD, + MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE, MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX, @@ -446,10 +450,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_BIND_DEVICE_TYPE, MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW, MENU_ENUM_LABEL_INPUT_DRIVER_UDEV, - MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT, - MENU_ENUM_LABEL_INPUT_TURBO_PERIOD, MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE, - MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD, MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE, @@ -474,7 +475,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_HOTKEY_SETTINGS, MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY, - MENU_ENUM_LABEL_INPUT_DUTY_CYCLE, MENU_ENUM_LABEL_INPUT_BIND_MODE, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW, @@ -559,16 +559,24 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, MENU_ENUM_SUBLABEL_INPUT_USER_BINDS, - MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, + MENU_ENUM_LABEL_INPUT_DUTY_CYCLE, + MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE, MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE, + + MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND, - MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, + MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD, + MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD, MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD, - MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, + + MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT, + MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT, MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT, - MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD, + + MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, + MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,