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

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
parent f621a6af43
commit a509f56116
15 changed files with 274 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View File

@ -52,10 +52,10 @@
#include "DolphinWX/Input/NunchukInputConfigDiag.h"
#include "DolphinWX/Input/TurntableInputConfigDiag.h"
#include "DolphinWX/WxUtils.h"
#include "InputCommon/ControlReference/ExpressionParser.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ExpressionParser.h"
#include "InputCommon/InputConfig.h"
using namespace ciface::ExpressionParser;
@ -177,7 +177,7 @@ void PadSettingSpin::UpdateValue()
}
ControlDialog::ControlDialog(InputConfigDialog* const parent, InputConfig& config,
ControllerInterface::ControlReference* const ref)
ControlReference* const ref)
: wxDialog(parent, wxID_ANY, _("Configure Control"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
control_reference(ref), m_config(config), m_parent(parent)
@ -220,8 +220,7 @@ ExtensionButton::ExtensionButton(wxWindow* const parent, ControllerEmu::Extensio
{
}
ControlButton::ControlButton(wxWindow* const parent,
ControllerInterface::ControlReference* const _ref,
ControlButton::ControlButton(wxWindow* const parent, ControlReference* const _ref,
const std::string& name, const unsigned int width,
const std::string& label)
: wxButton(parent, wxID_ANY), control_reference(_ref), m_name(name),
@ -387,8 +386,8 @@ bool ControlDialog::Validate()
control_reference->expression = WxStrToStr(textctrl->GetValue());
auto lock = ControllerEmu::GetStateLock();
g_controller_interface.UpdateReference(control_reference,
m_parent->GetController()->default_device);
control_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->default_device);
UpdateGUI();
@ -426,8 +425,8 @@ void ControlDialog::ClearControl(wxCommandEvent&)
control_reference->expression.clear();
auto lock = ControllerEmu::GetStateLock();
g_controller_interface.UpdateReference(control_reference,
m_parent->GetController()->default_device);
control_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->default_device);
UpdateGUI();
}
@ -485,8 +484,8 @@ void ControlDialog::SetSelectedControl(wxCommandEvent&)
control_reference->expression = textctrl->GetValue();
auto lock = ControllerEmu::GetStateLock();
g_controller_interface.UpdateReference(control_reference,
m_parent->GetController()->default_device);
control_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->default_device);
UpdateGUI();
}
@ -521,8 +520,8 @@ void ControlDialog::AppendControl(wxCommandEvent& event)
control_reference->expression = textctrl->GetValue();
auto lock = ControllerEmu::GetStateLock();
g_controller_interface.UpdateReference(control_reference,
m_parent->GetController()->default_device);
control_reference->UpdateReference(g_controller_interface,
m_parent->GetController()->default_device);
UpdateGUI();
}
@ -703,7 +702,8 @@ bool InputConfigDialog::DetectButton(ControlButton* button)
GetExpressionForControl(expr, control_name);
button->control_reference->expression = expr;
auto lock = ControllerEmu::GetStateLock();
g_controller_interface.UpdateReference(button->control_reference, controller->default_device);
button->control_reference->UpdateReference(g_controller_interface,
controller->default_device);
success = true;
}

13
Source/Core/DolphinWX/Input/InputConfigDiag.h
View File

@ -23,8 +23,8 @@
#include <wx/spinctrl.h>
#include <wx/timer.h>
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"
class DolphinSlider;
@ -100,14 +100,13 @@ class InputConfigDialog;
class ControlDialog : public wxDialog
{
public:
ControlDialog(InputConfigDialog* const parent, InputConfig& config,
ControllerInterface::ControlReference* const ref);
ControlDialog(InputConfigDialog* const parent, InputConfig& config, ControlReference* const ref);
bool Validate() override;
int GetRangeSliderValue() const;
ControllerInterface::ControlReference* const control_reference;
ControlReference* const control_reference;
InputConfig& m_config;
private:
@ -151,10 +150,10 @@ public:
class ControlButton : public wxButton
{
public:
ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref,
const std::string& name, const unsigned int width, const std::string& label = {});
ControlButton(wxWindow* const parent, ControlReference* const _ref, const std::string& name,
const unsigned int width, const std::string& label = {});
ControllerInterface::ControlReference* const control_reference;
ControlReference* const control_reference;
const std::string m_name;
protected: