From f0eeb3c63ac49b9f4b9dd837038b00caeefdcb01 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 16 Mar 2017 04:41:36 -0400 Subject: SI: Namespace device classes Places all of the SI code under the SerialInterface namespace instead of only the main source file. This keeps all SI code under a common name, as well as out of the global namespace --- Source/Core/InputCommon/GCAdapter_Android.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/GCAdapter_Android.cpp') diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp index d8d40fb659..7b0c6e1545 100644 --- a/Source/Core/InputCommon/GCAdapter_Android.cpp +++ b/Source/Core/InputCommon/GCAdapter_Android.cpp @@ -385,10 +385,11 @@ bool DeviceConnected(int chan) bool UseAdapter() { - return SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_WIIU_ADAPTER || - SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_WIIU_ADAPTER || - SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_WIIU_ADAPTER || - SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_WIIU_ADAPTER; + const auto& si_devices = SConfig::GetInstance().m_SIDevice; + + return std::any_of(std::begin(si_devices), std::end(si_devices), [](const auto device_type) { + return device_type == SerialInterface::SIDEVICE_WIIU_ADAPTER; + }); } void ResetRumble() -- cgit v1.2.3