piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

namespace fixup

Browse Source
This commit is contained in:
Jordan Woyak 2024-11-07 21:55:30 -06:00
parent 768f0161a8
commit b95af2e6f0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/InputCommon/ControllerInterface/GCAdapter/GCAdapter.cpp
View File

@ -10,10 +10,9 @@
#include "InputCommon/GCAdapter.h" #include "InputCommon/GCAdapter.h"
#include "InputCommon/GCPadStatus.h" #include "InputCommon/GCPadStatus.h"
// TODO: name? // TODO: namespace name matching the one in InputCommon/GCAdapter.h is annoying
namespace ciface::GCAdapter namespace ciface::GCAdapter
{ {
// TODO: name?
constexpr auto SOURCE_NAME = "GCAdapter"; constexpr auto SOURCE_NAME = "GCAdapter";
class GCController; class GCController;
@ -150,7 +149,7 @@ public:
m_last_state = new_state; m_last_state = new_state;
GCAdapter::Output(m_index, new_state); ::GCAdapter::Output(m_index, new_state);
} }
std::string GetName() const override { return "Motor"; } std::string GetName() const override { return "Motor"; }
@ -170,7 +169,7 @@ public:
AddInput(new DigitalInput{&m_pad_status.button, i}); AddInput(new DigitalInput{&m_pad_status.button, i});
// TODO: use origin values. // TODO: use origin values.
const auto origin = GCAdapter::GetOrigin(index); const auto origin = ::GCAdapter::GetOrigin(index);
// Add sticks. // Add sticks.
for (auto& props : stick_inputs) for (auto& props : stick_inputs)
@ -204,7 +203,7 @@ public:
Core::DeviceRemoval UpdateInput() override Core::DeviceRemoval UpdateInput() override
{ {
m_pad_status = GCAdapter::PeekInput(m_index); m_pad_status = ::GCAdapter::PeekInput(m_index);
return Core::DeviceRemoval::Keep; return Core::DeviceRemoval::Keep;
} }
@ -216,14 +215,14 @@ private:
InputBackend::InputBackend(ControllerInterface* controller_interface) InputBackend::InputBackend(ControllerInterface* controller_interface)
: ciface::InputBackend(controller_interface) : ciface::InputBackend(controller_interface)
{ {
GCAdapter::Init(); ::GCAdapter::Init();
} }
void InputBackend::PopulateDevices() void InputBackend::PopulateDevices()
{ {
for (int i = 0; i != SerialInterface::MAX_SI_CHANNELS; ++i) for (int i = 0; i != SerialInterface::MAX_SI_CHANNELS; ++i)
{ {
if (GCAdapter::DeviceConnected(i)) if (::GCAdapter::DeviceConnected(i))
{ {
auto new_device = std::make_shared<GCController>(i); auto new_device = std::make_shared<GCController>(i);
m_devices[i] = new_device; m_devices[i] = new_device;
@ -237,7 +236,7 @@ void InputBackend::UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>&
// "Hotplug" is handled here. // "Hotplug" is handled here.
for (int i = 0; i != SerialInterface::MAX_SI_CHANNELS; ++i) for (int i = 0; i != SerialInterface::MAX_SI_CHANNELS; ++i)
{ {
const bool is_device_connected = GCAdapter::DeviceConnected(i); const bool is_device_connected = ::GCAdapter::DeviceConnected(i);
const auto device = m_devices[i].lock(); const auto device = m_devices[i].lock();
if (is_device_connected == (device != nullptr)) if (is_device_connected == (device != nullptr))