summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-01-25 20:34:03 +0100
committerJosJuice <josjuice@gmail.com>2022-02-18 21:27:10 +0100
commitaff45c91fc0729595a2e40511404386726bfd205 (patch)
tree6be9c49916a183e01d7c3263930228a3e2c79c84 /Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
parent5e595616379a694789fe749e40a27ef069f0090e (diff)
Port Wiimote source settings to the new config system
This lets us finally get rid of BootManager's ConfigCache!
Diffstat (limited to 'Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
index e5616da4bf..613455ead6 100644
--- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
@@ -17,7 +17,10 @@
#include <map>
#include <optional>
+#include "Common/Config/Config.h"
+
#include "Core/Config/MainSettings.h"
+#include "Core/Config/WiimoteSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/Wiimote.h"
@@ -301,9 +304,9 @@ void WiimoteControllersWidget::LoadSettings()
{
for (size_t i = 0; i < m_wiimote_groups.size(); i++)
{
- m_wiimote_boxes[i]->setCurrentIndex(int(WiimoteCommon::GetSource(u32(i))));
+ m_wiimote_boxes[i]->setCurrentIndex(int(Config::Get(Config::GetInfoForWiimoteSource(int(i)))));
}
- m_wiimote_real_balance_board->setChecked(WiimoteCommon::GetSource(WIIMOTE_BALANCE_BOARD) ==
+ m_wiimote_real_balance_board->setChecked(Config::Get(Config::WIIMOTE_BB_SOURCE) ==
WiimoteSource::Real);
m_wiimote_speaker_data->setChecked(Config::Get(Config::MAIN_WIIMOTE_ENABLE_SPEAKER));
m_wiimote_ciface->setChecked(Config::Get(Config::MAIN_CONNECT_WIIMOTES_FOR_CONTROLLER_INTERFACE));
@@ -328,17 +331,15 @@ void WiimoteControllersWidget::SaveSettings()
Config::SetBaseOrCurrent(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED,
m_wiimote_passthrough->isChecked());
- WiimoteCommon::SetSource(WIIMOTE_BALANCE_BOARD, m_wiimote_real_balance_board->isChecked() ?
- WiimoteSource::Real :
- WiimoteSource::None);
+ const WiimoteSource bb_source =
+ m_wiimote_real_balance_board->isChecked() ? WiimoteSource::Real : WiimoteSource::None;
+ Config::SetBaseOrCurrent(Config::WIIMOTE_BB_SOURCE, bb_source);
for (size_t i = 0; i < m_wiimote_groups.size(); i++)
{
const int index = m_wiimote_boxes[i]->currentIndex();
- WiimoteCommon::SetSource(u32(i), WiimoteSource(index));
+ Config::SetBaseOrCurrent(Config::GetInfoForWiimoteSource(int(i)), WiimoteSource(index));
}
- UICommon::SaveWiimoteSources();
-
SConfig::GetInstance().SaveSettings();
}