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

EmulatedController: encapsulate default device behind getters/setters

Browse Source
This commit is contained in:
Michael M
2017-11-04 14:08:26 -07:00
parent bb0794715c
commit 1b1dd1d749
8 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
View File

@ -37,7 +37,7 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
for (auto& ctrlGroup : groups)
{
for (auto& control : ctrlGroup->controls)
control->control_ref.get()->UpdateReference(devi, default_device);
control->control_ref.get()->UpdateReference(devi, GetDefaultDevice());
// extension
if (ctrlGroup->type == GroupType::Extension)
@ -48,8 +48,22 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
}
}
void EmulatedController::UpdateDefaultDevice()
const ciface::Core::DeviceQualifier& EmulatedController::GetDefaultDevice() const
{
return m_default_device;
}
void EmulatedController::SetDefaultDevice(const std::string& device)
{
ciface::Core::DeviceQualifier devq;
devq.FromString(device);
SetDefaultDevice(std::move(devq));
}
void EmulatedController::SetDefaultDevice(ciface::Core::DeviceQualifier devq)
{
m_default_device = std::move(devq);
for (auto& ctrlGroup : groups)
{
// extension
@ -57,8 +71,7 @@ void EmulatedController::UpdateDefaultDevice()
{
for (auto& ai : ((Extension*)ctrlGroup.get())->attachments)
{
ai->default_device = default_device;
ai->UpdateDefaultDevice();
ai->SetDefaultDevice(m_default_device);
}
}
}
@ -66,11 +79,11 @@ void EmulatedController::UpdateDefaultDevice()
void EmulatedController::LoadConfig(IniFile::Section* sec, const std::string& base)
{
std::string defdev = default_device.ToString();
std::string defdev = GetDefaultDevice().ToString();
if (base.empty())
{
sec->Get(base + "Device", &defdev, "");
default_device.FromString(defdev);
SetDefaultDevice(defdev);
}
for (auto& cg : groups)
@ -79,7 +92,7 @@ void EmulatedController::LoadConfig(IniFile::Section* sec, const std::string& ba
void EmulatedController::SaveConfig(IniFile::Section* sec, const std::string& base)
{
const std::string defdev = default_device.ToString();
const std::string defdev = GetDefaultDevice().ToString();
if (base.empty())
sec->Set(/*std::string(" ") +*/ base + "Device", defdev, "");
@ -96,8 +109,7 @@ void EmulatedController::LoadDefaults(const ControllerInterface& ciface)
const std::string& default_device_string = ciface.GetDefaultDeviceString();
if (!default_device_string.empty())
{
default_device.FromString(default_device_string);
UpdateDefaultDevice();
SetDefaultDevice(default_device_string);
}
}
} // namespace ControllerEmu