Merge pull request #4895 from lioncash/const
ControllerEmu: Add const to UpdateReferences() first reference parameter
This commit is contained in:
commit
d19aabb55b
|
@ -26,7 +26,7 @@ bool ControlReference::InputGateOn()
|
|||
// Updates a controlreference's binded devices/controls
|
||||
// need to call this to re-parse a control reference's expression after changing it
|
||||
//
|
||||
void ControlReference::UpdateReference(ciface::Core::DeviceContainer& devices,
|
||||
void ControlReference::UpdateReference(const ciface::Core::DeviceContainer& devices,
|
||||
const ciface::Core::DeviceQualifier& default_device)
|
||||
{
|
||||
Expression* expr;
|
||||
|
|
|
@ -32,7 +32,7 @@ public:
|
|||
|
||||
int BoundCount() const;
|
||||
ciface::ExpressionParser::ExpressionParseStatus GetParseStatus() const;
|
||||
void UpdateReference(ciface::Core::DeviceContainer& devices,
|
||||
void UpdateReference(const ciface::Core::DeviceContainer& devices,
|
||||
const ciface::Core::DeviceQualifier& default_device);
|
||||
|
||||
ControlState range;
|
||||
|
|
|
@ -30,7 +30,7 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
|
|||
return lock;
|
||||
}
|
||||
|
||||
void EmulatedController::UpdateReferences(ControllerInterface& devi)
|
||||
void EmulatedController::UpdateReferences(const ControllerInterface& devi)
|
||||
{
|
||||
const auto lock = GetStateLock();
|
||||
for (auto& ctrlGroup : groups)
|
||||
|
|
|
@ -33,7 +33,7 @@ public:
|
|||
virtual void SaveConfig(IniFile::Section* sec, const std::string& base = "");
|
||||
void UpdateDefaultDevice();
|
||||
|
||||
void UpdateReferences(ControllerInterface& devi);
|
||||
void UpdateReferences(const ControllerInterface& devi);
|
||||
|
||||
// This returns a lock that should be held before calling State() on any control
|
||||
// references and GetState(), by extension. This prevents a race condition
|
||||
|
|
Loading…
Reference in New Issue