mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 11:49:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

InputCommon: Extract ControlReference from ControllerInterface

Browse source 
Better separation of concerns. Relegates `ControllerInterface` to
enumerating input controls, and the new `ControlReference` deals with
combining inputs and configuration expression parsing.
This commit is contained in:
Michael Maltese 2016-10-11 17:48:38 -07:00
commit a509f56116
15 changed files with 274 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/Core/InputCommon/ControllerInterface/Device.cpp
View file

@ -7,12 +7,6 @@
#include <string>
#include <tuple>
// 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
//