input_remap_ports_on_button_press -> input_assign_ports_on_button_press

Author: nijm

configuration.c

@@ -2178,7 +2178,7 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("input_turbo_allow_dpad",        &settings->bools.input_turbo_allow_dpad, true, DEFAULT_TURBO_ALLOW_DPAD, false);
    SETTING_BOOL("input_auto_mouse_grab",         &settings->bools.input_auto_mouse_grab, true, DEFAULT_INPUT_AUTO_MOUSE_GRAB, false);
    SETTING_BOOL("input_remap_binds_enable",      &settings->bools.input_remap_binds_enable, true, true, false);
-   SETTING_BOOL("input_remap_ports_on_button_press",   &settings->bools.input_remap_ports_on_button_press, true, DEFAULT_INPUT_REMAP_PORTS_ON_BUTTON_PRESS, false);
+   SETTING_BOOL("input_assign_ports_on_button_press",   &settings->bools.input_assign_ports_on_button_press, true, DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS, false);
    SETTING_BOOL("input_remap_sort_by_controller_enable",      &settings->bools.input_remap_sort_by_controller_enable, true, false, false);
    SETTING_BOOL("input_hotkey_device_merge",     &settings->bools.input_hotkey_device_merge, true, DEFAULT_INPUT_HOTKEY_DEVICE_MERGE, false);
    SETTING_BOOL("input_hotkey_follows_player1",  &settings->bools.input_hotkey_follows_player1, true, DEFAULT_INPUT_HOTKEY_FOLLOWS_PLAYER1, false);

intl/msg_hash_lbl.h

@@ -2171,8 +2171,8 @@ MSG_HASH(
    "input_remap_binds_enable"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
-   "input_remap_ports_on_button_press"
+   MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+   "input_assign_ports_on_button_press"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE,

intl/msg_hash_us.h

@@ -3338,11 +3338,11 @@ MSG_HASH(
    "Override the input binds with the remapped binds set for the current core."
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
+   MENU_ENUM_LABEL_VALUE_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
    "Remap Ports on Button Press"
    )
 MSG_HASH(
-   MENU_ENUM_SUBLABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
+   MENU_ENUM_SUBLABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
    "First user to press a button becomes player 1, second becomes player 2, etc."
    )
 MSG_HASH(
@@ -6011,7 +6011,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_USER_MAPPED_TO_CORE_PORT,
-   "Remap Ports on Button Press Notifications"
+   "Assign Ports on Button Press Notifications"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_USER_MAPPED_TO_CORE_PORT,

menu/menu_displaylist.c

@@ -8278,7 +8278,7 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_INPUT_BIND_HOLD,                       PARSE_ONLY_UINT,  true},
                {MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,               PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,              PARSE_ONLY_BOOL,  true},
-               {MENU_ENUM_LABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,     PARSE_ONLY_BOOL,  true},
+               {MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,     PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE, PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,                    PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,           PARSE_ONLY_BOOL,  true},

menu/menu_setting.c

@@ -8944,7 +8944,7 @@ static void general_write_handler(rarch_setting_t *setting)
                      NULL, menu_st->userdata);
          }
          break;
-      case MENU_ENUM_LABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS:
+      case MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS:
          {
             input_remapping_set_defaults(false);
          }
@@ -15633,10 +15633,10 @@ static bool setting_append_list(
 
             CONFIG_BOOL(
                   list, list_info,
-                  &settings->bools.input_remap_ports_on_button_press,
-                  MENU_ENUM_LABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
-                  MENU_ENUM_LABEL_VALUE_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
-                  DEFAULT_INPUT_REMAP_PORTS_ON_BUTTON_PRESS,
+                  &settings->bools.input_assign_ports_on_button_press,
+                  MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+                  MENU_ENUM_LABEL_VALUE_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+                  DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,

msg_hash.h

@@ -1336,7 +1336,7 @@ enum msg_hash_enums
    MENU_LABEL(INPUT_BIND_TIMEOUT),
    MENU_LABEL(INPUT_BIND_HOLD),
    MENU_LABEL(INPUT_REMAP_BINDS_ENABLE),
-   MENU_LABEL(INPUT_REMAP_PORTS_ON_BUTTON_PRESS),
+   MENU_LABEL(INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS),
    MENU_LABEL(INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE),
    MENU_LABEL(INPUT_OVERLAY_ENABLE),
    MENU_LABEL(INPUT_OSK_OVERLAY_ENABLE),