artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4635 from lioncash/gc-adap

Browse source 
gc_adapter: Make DeviceConnected() a const member function
This commit is contained in:
bunnei 2020-09-09 22:27:49 -04:00 committed by GitHub
parent 841b295ad0 c715fc4c5e
commit d90961122c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input_common/gcadapter/gc_adapter.cpp
View file

@ -283,7 +283,7 @@ void Adapter::Reset() {
} }
} }
bool Adapter::DeviceConnected(std::size_t port) { bool Adapter::DeviceConnected(std::size_t port) const {
return adapter_controllers_status[port] != ControllerTypes::None; return adapter_controllers_status[port] != ControllerTypes::None;
} }

2
src/input_common/gcadapter/gc_adapter.h
View file

@ -76,7 +76,7 @@ public:
void EndConfiguration(); void EndConfiguration();
/// Returns true if there is a device connected to port /// Returns true if there is a device connected to port
bool DeviceConnected(std::size_t port); bool DeviceConnected(std::size_t port) const;
std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue(); std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue();
const std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const; const std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const;

14
src/input_common/gcadapter/gc_poller.cpp
View file

@ -15,7 +15,7 @@ namespace InputCommon {
class GCButton final : public Input::ButtonDevice { class GCButton final : public Input::ButtonDevice {
public: public:
explicit GCButton(int port_, int button_, GCAdapter::Adapter* adapter) explicit GCButton(int port_, int button_, const GCAdapter::Adapter* adapter)
: port(port_), button(button_), gcadapter(adapter) {} : port(port_), button(button_), gcadapter(adapter) {}
~GCButton() override; ~GCButton() override;
@ -30,13 +30,13 @@ public:
private: private:
const int port; const int port;
const int button; const int button;
GCAdapter::Adapter* gcadapter; const GCAdapter::Adapter* gcadapter;
}; };
class GCAxisButton final : public Input::ButtonDevice { class GCAxisButton final : public Input::ButtonDevice {
public: public:
explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_, explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_,
GCAdapter::Adapter* adapter) const GCAdapter::Adapter* adapter)
: port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_), : port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_),
gcadapter(adapter), gcadapter(adapter),
origin_value(static_cast<float>(adapter->GetOriginValue(port_, axis_))) {} origin_value(static_cast<float>(adapter->GetOriginValue(port_, axis_))) {}
@ -60,7 +60,7 @@ private:
const int axis; const int axis;
float threshold; float threshold;
bool trigger_if_greater; bool trigger_if_greater;
GCAdapter::Adapter* gcadapter; const GCAdapter::Adapter* gcadapter;
const float origin_value; const float origin_value;
}; };
@ -149,8 +149,8 @@ void GCButtonFactory::EndConfiguration() {
class GCAnalog final : public Input::AnalogDevice { class GCAnalog final : public Input::AnalogDevice {
public: public:
GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, GCAdapter::Adapter* adapter, GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_,
float range_) const GCAdapter::Adapter* adapter, float range_)
: port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter), : port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter),
origin_value_x(static_cast<float>(adapter->GetOriginValue(port_, axis_x_))), origin_value_x(static_cast<float>(adapter->GetOriginValue(port_, axis_x_))),
origin_value_y(static_cast<float>(adapter->GetOriginValue(port_, axis_y_))), origin_value_y(static_cast<float>(adapter->GetOriginValue(port_, axis_y_))),
@ -212,7 +212,7 @@ private:
const int axis_x; const int axis_x;
const int axis_y; const int axis_y;
const float deadzone; const float deadzone;
GCAdapter::Adapter* gcadapter; const GCAdapter::Adapter* gcadapter;
const float origin_value_x; const float origin_value_x;
const float origin_value_y; const float origin_value_y;
const float range; const float range;