CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5165 from lioncash/copy-controller 

controller: Avoid unnecessary copies in ConfigurationComplete()
master
Morph 2020-12-08 20:48:45 +07:00 committed by GitHub
parent 607bb8d14b 215cfbb757
commit 51e6f8271a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/hle/service/am/applets/controller.cpp
Unescape Escape View File

@ -29,14 +29,14 @@ static Core::Frontend::ControllerParameters ConvertToFrontendParameters(
npad_style_set.raw = private_arg.style_set; npad_style_set.raw = private_arg.style_set;
return { return {
.min_players = std::max(s8(1), header.player_count_min), .min_players = std::max(s8{1}, header.player_count_min),
.max_players = header.player_count_max, .max_players = header.player_count_max,
.keep_controllers_connected = header.enable_take_over_connection, .keep_controllers_connected = header.enable_take_over_connection,
.enable_single_mode = header.enable_single_mode, .enable_single_mode = header.enable_single_mode,
.enable_border_color = header.enable_identification_color, .enable_border_color = header.enable_identification_color,
.border_colors = identification_colors, .border_colors = std::move(identification_colors),
.enable_explain_text = enable_text, .enable_explain_text = enable_text,
.explain_text = text, .explain_text = std::move(text),
.allow_pro_controller = npad_style_set.pro_controller == 1, .allow_pro_controller = npad_style_set.pro_controller == 1,
.allow_handheld = npad_style_set.handheld == 1, .allow_handheld = npad_style_set.handheld == 1,
.allow_dual_joycons = npad_style_set.joycon_dual == 1, .allow_dual_joycons = npad_style_set.joycon_dual == 1,
@ -227,15 +227,14 @@ void Controller::ConfigurationComplete() {
// If enable_single_mode is enabled, player_count is 1 regardless of any other parameters. // If enable_single_mode is enabled, player_count is 1 regardless of any other parameters.
// Otherwise, only count connected players from P1-P8. // Otherwise, only count connected players from P1-P8.
result_info.player_count = result_info.player_count =
is_single_mode ? 1 is_single_mode
: static_cast<s8>(std::count_if( ? 1
players.begin(), players.end() - 2, : static_cast<s8>(std::count_if(players.begin(), players.end() - 2,
[](Settings::PlayerInput player) { return player.connected; })); [](const auto& player) { return player.connected; }));
result_info.selected_id = HID::Controller_NPad::IndexToNPad( result_info.selected_id = HID::Controller_NPad::IndexToNPad(std::distance(
std::distance(players.begin(), players.begin(), std::find_if(players.begin(), players.end(),
std::find_if(players.begin(), players.end(), [](const auto& player) { return player.connected; })));
[](Settings::PlayerInput player) { return player.connected; })));
result_info.result = 0; result_info.result = 0;