From a509f56116d308c96e38898e07d3538f26a1b7af Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Tue, 11 Oct 2016 17:48:38 -0700 Subject: InputCommon: Extract ControlReference from ControllerInterface Better separation of concerns. Relegates `ControllerInterface` to enumerating input controls, and the new `ControlReference` deals with combining inputs and configuration expression parsing. --- Source/Core/InputCommon/ControllerInterface/Device.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 401e5b035b..930352a908 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -7,12 +7,6 @@ #include #include -// For InputGateOn() -// This is a really bad layering violation, but it's the cleanest -// place I could find to put it. -#include "Core/ConfigManager.h" -#include "Core/Host.h" - #include "InputCommon/ControllerInterface/Device.h" namespace ciface @@ -67,16 +61,6 @@ Device::Output* Device::FindOutput(const std::string& name) const return nullptr; } -bool Device::Control::InputGateOn() -{ - if (SConfig::GetInstance().m_BackgroundInput) - return true; - else if (Host_RendererHasFocus() || Host_UIHasFocus()) - return true; - else - return false; -} - // // DeviceQualifier :: ToString // -- cgit v1.2.3