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

ControlReference: hide is_input behind function

Browse Source
This commit is contained in:
Michael Maltese
2016-12-09 13:13:11 -08:00
parent 813a725f68
commit 9a632ea7b9
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/InputCommon/ControlReference/ControlReference.cpp
View File

@ -32,7 +32,7 @@ void ControlReference::UpdateReference(ciface::Core::DeviceContainer& devices,
delete parsed_expression;
parsed_expression = nullptr;
ControlFinder finder(devices, default_device, is_input);
ControlFinder finder(devices, default_device, IsInput());
parse_error = ParseExpression(expression, finder, &parsed_expression);
}
@ -48,19 +48,27 @@ int ControlReference::BoundCount() const
return 0;
}
ControlReference::ControlReference(const bool _is_input)
: range(1), is_input(_is_input), parsed_expression(nullptr)
ControlReference::ControlReference() : range(1), parsed_expression(nullptr)
{
}
InputReference::InputReference() : ControlReference(true)
InputReference::InputReference() : ControlReference()
{
}
OutputReference::OutputReference() : ControlReference(false)
OutputReference::OutputReference() : ControlReference()
{
}
bool InputReference::IsInput() const
{
return true;
}
bool OutputReference::IsInput() const
{
return false;
}
//
// InputReference :: State
//

6
Source/Core/InputCommon/ControlReference/ControlReference.h
View File

@ -26,6 +26,7 @@ public:
virtual ControlState State(const ControlState state = 0) = 0;
virtual ciface::Core::Device::Control* Detect(const unsigned int ms,
ciface::Core::Device* const device) = 0;
virtual bool IsInput() const = 0;
int BoundCount() const;
void UpdateReference(ciface::Core::DeviceContainer& devices,
@ -33,11 +34,10 @@ public:
ControlState range;
std::string expression;
const bool is_input;
ciface::ExpressionParser::ExpressionParseStatus parse_error;
protected:
ControlReference(const bool _is_input);
ControlReference();
ciface::ExpressionParser::Expression* parsed_expression;
};
@ -50,6 +50,7 @@ class InputReference : public ControlReference
{
public:
InputReference();
bool IsInput() const override;
ControlState State(const ControlState state) override;
ciface::Core::Device::Control* Detect(const unsigned int ms,
ciface::Core::Device* const device) override;
@ -64,6 +65,7 @@ class OutputReference : public ControlReference
{
public:
OutputReference();
bool IsInput() const override;
ControlState State(const ControlState state) override;
ciface::Core::Device::Control* Detect(const unsigned int ms,
ciface::Core::Device* const device) override;