prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address nits

Browse Source
This commit is contained in:
anirudhb
2020-05-05 14:22:56 -07:00
parent f03a1a878f
commit f47d53d0d0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/yuzu/configuration/config.cpp
View File

@@ -230,11 +230,11 @@ const std::array<UISettings::Shortcut, 15> Config::default_hotkeys{{
}}; }};
// clang-format on // clang-format on
const std::array<Settings::MotionRaw, 2> Config::default_motion_devices{{ const std::array<std::pair<bool, const char*>, 2> Config::default_motion_devices{{
{false, std::string("engine:cemuhookudp,address:127.0.0.1,port:26760,pad_index:0,cx:0.0,cy:0.0," {false, "engine:cemuhookudp,address:127.0.0.1,port:26760,pad_index:0,cx:0.0,cy:0.0,"
"cz:0.0,sensitivity:1.0")}, "cz:0.0,sensitivity:1.0"},
{false, std::string("engine:cemuhookudp,address:127.0.0.1,port:26760,pad_index:0,cx:0.0,cy:0.0," {false, "engine:cemuhookudp,address:127.0.0.1,port:26760,pad_index:0,cx:0.0,cy:0.0,"
"cz:0.0,sensitivity:1.0")}, "cz:0.0,sensitivity:1.0"},
}}; }};
void Config::ReadPlayerValues() { void Config::ReadPlayerValues() {
@@ -301,23 +301,23 @@ void Config::ReadPlayerValues() {
} }
} }
for (int i = 0; i < player.motion_devices.size(); ++i) { for (std::size_t i = 0; i < player.motion_devices.size(); ++i) {
const Settings::MotionRaw& default_param = default_motion_devices[i]; const std::pair<bool, const char*>& default_param = default_motion_devices[i];
auto& player_motion_device = player.motion_devices[i]; auto& player_motion_device = player.motion_devices[i];
player_motion_device.config = player_motion_device.config =
qt_config qt_config
->value(QStringLiteral("player_%1_motion_device%2").arg(p).arg(i), ->value(QStringLiteral("player_%1_motion_device%2").arg(p).arg(i),
QString::fromStdString(default_param.config)) QString::fromLocal8Bit(std::get<1>(default_param)))
.toString() .toString()
.toStdString(); .toStdString();
player_motion_device.enabled = player_motion_device.enabled =
qt_config qt_config
->value(QStringLiteral("player_%1_motion_device%2/enabled").arg(p).arg(i), ->value(QStringLiteral("player_%1_motion_device%2/enabled").arg(p).arg(i),
default_param.enabled) std::get<0>(default_param))
.toBool(); .toBool();
if (player_motion_device.config.empty()) { if (player_motion_device.config.empty()) {
player_motion_device.config = default_param.config; player_motion_device.config = std::get<1>(default_param);
} }
} }
} }
@@ -875,12 +875,12 @@ void Config::SavePlayerValues() {
QString::fromStdString(default_param)); QString::fromStdString(default_param));
} }
for (int i = 0; i < player.motion_devices.size(); ++i) { for (std::size_t i = 0; i < player.motion_devices.size(); ++i) {
const Settings::MotionRaw& default_param = default_motion_devices[i]; const std::pair<bool, const char*>& default_param = default_motion_devices[i];
const Settings::MotionRaw& player_motion_device = player.motion_devices[i]; const Settings::MotionRaw& player_motion_device = player.motion_devices[i];
WriteSetting(QStringLiteral("player_%1_motion_device%2").arg(p).arg(i), WriteSetting(QStringLiteral("player_%1_motion_device%2").arg(p).arg(i),
QString::fromStdString(player_motion_device.config), QString::fromStdString(player_motion_device.config),
QString::fromStdString(default_param.config)); QString::fromLocal8Bit(std::get<1>(default_param)));
WriteSetting(QStringLiteral("player_%1_motion_device%2/enabled").arg(p).arg(i), WriteSetting(QStringLiteral("player_%1_motion_device%2/enabled").arg(p).arg(i),
player_motion_device.enabled); player_motion_device.enabled);
} }

2
src/yuzu/configuration/config.h
View File

@@ -28,7 +28,7 @@ public:
static const std::array<int, Settings::NativeKeyboard::NumKeyboardKeys> default_keyboard_keys; static const std::array<int, Settings::NativeKeyboard::NumKeyboardKeys> default_keyboard_keys;
static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
static const std::array<UISettings::Shortcut, 15> default_hotkeys; static const std::array<UISettings::Shortcut, 15> default_hotkeys;
static const std::array<Settings::MotionRaw, 2> default_motion_devices; static const std::array<std::pair<bool, const char*>, 2> default_motion_devices;
private: private:
void ReadValues(); void ReadValues();