piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6167 from ligfx/encapsulatedefaultdevice

Browse Source 
EmulatedController: encapsulate default device behind getters/setters
This commit is contained in:
Leo Lam
2017-11-11 17:11:56 +01:00
committed by GitHub
parent 338bffd1e7 1b1dd1d749
commit 1e24a5f309
8 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
View File

@ -114,7 +114,7 @@ void IOWindow::Update()
m_range_spinbox->setValue(m_reference->range * SLIDER_TICK_COUNT);
m_range_slider->setValue(m_reference->range * SLIDER_TICK_COUNT);
m_devq.FromString(m_controller->default_device.ToString());
m_devq.FromString(m_controller->GetDefaultDevice().ToString());
UpdateDeviceList();
UpdateOptionList();
@ -147,7 +147,7 @@ void IOWindow::AppendSelectedOption(const std::string& prefix)
m_expression_text->insertPlainText(
QString::fromStdString(prefix) +
MappingCommon::GetExpressionForControl(m_option_list->currentItem()->text(), m_devq,
m_controller->default_device));
m_controller->GetDefaultDevice()));
}
void IOWindow::OnDeviceChanged(const QString& device)
@ -237,10 +237,9 @@ void IOWindow::UpdateDeviceList()
Core::RunAsCPUThread([&] {
g_controller_interface.RefreshDevices();
m_controller->UpdateReferences(g_controller_interface);
m_controller->UpdateDefaultDevice();
// Adding default device regardless if it's currently connected or not
const auto default_device = m_controller->default_device.ToString();
const auto default_device = m_controller->GetDefaultDevice().ToString();
m_devices_combo->addItem(QString::fromStdString(default_device));

6
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
View File

@ -56,9 +56,9 @@ void MappingButton::OnButtonPressed()
// Avoid that the button press itself is registered as an event
Common::SleepCurrentThread(100);
const auto expr = MappingCommon::DetectExpression(m_reference, dev.get(),
m_parent->GetParent()->GetDeviceQualifier(),
m_parent->GetController()->default_device);
const auto expr = MappingCommon::DetectExpression(
m_reference, dev.get(), m_parent->GetParent()->GetDeviceQualifier(),
m_parent->GetController()->GetDefaultDevice());
releaseMouse();
releaseKeyboard();

5
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
View File

@ -211,7 +211,7 @@ void MappingWindow::OnDeviceChanged(int index)
{
const auto device = m_devices_combo->currentText().toStdString();
m_devq.FromString(device);
m_controller->default_device.FromString(device);
m_controller->SetDefaultDevice(device);
}
void MappingWindow::RefreshDevices()
@ -221,9 +221,8 @@ void MappingWindow::RefreshDevices()
Core::RunAsCPUThread([&] {
g_controller_interface.RefreshDevices();
m_controller->UpdateReferences(g_controller_interface);
m_controller->UpdateDefaultDevice();
const auto default_device = m_controller->default_device.ToString();
const auto default_device = m_controller->GetDefaultDevice().ToString();
m_devices_combo->addItem(QString::fromStdString(default_device));