diff options
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 2 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 74759ea7d..c6c423c4b 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp | |||
| @@ -283,7 +283,7 @@ void Adapter::Reset() { | |||
| 283 | } | 283 | } |
| 284 | } | 284 | } |
| 285 | 285 | ||
| 286 | bool Adapter::DeviceConnected(std::size_t port) { | 286 | bool Adapter::DeviceConnected(std::size_t port) const { |
| 287 | return adapter_controllers_status[port] != ControllerTypes::None; | 287 | return adapter_controllers_status[port] != ControllerTypes::None; |
| 288 | } | 288 | } |
| 289 | 289 | ||
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h index bed81915c..20e97d283 100644 --- a/src/input_common/gcadapter/gc_adapter.h +++ b/src/input_common/gcadapter/gc_adapter.h | |||
| @@ -76,7 +76,7 @@ public: | |||
| 76 | void EndConfiguration(); | 76 | void EndConfiguration(); |
| 77 | 77 | ||
| 78 | /// Returns true if there is a device connected to port | 78 | /// Returns true if there is a device connected to port |
| 79 | bool DeviceConnected(std::size_t port); | 79 | bool DeviceConnected(std::size_t port) const; |
| 80 | 80 | ||
| 81 | std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue(); | 81 | std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue(); |
| 82 | const std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const; | 82 | const std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const; |
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 1c8d8523a..92e9e8e89 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp | |||
| @@ -15,7 +15,7 @@ namespace InputCommon { | |||
| 15 | 15 | ||
| 16 | class GCButton final : public Input::ButtonDevice { | 16 | class GCButton final : public Input::ButtonDevice { |
| 17 | public: | 17 | public: |
| 18 | explicit GCButton(int port_, int button_, GCAdapter::Adapter* adapter) | 18 | explicit GCButton(int port_, int button_, const GCAdapter::Adapter* adapter) |
| 19 | : port(port_), button(button_), gcadapter(adapter) {} | 19 | : port(port_), button(button_), gcadapter(adapter) {} |
| 20 | 20 | ||
| 21 | ~GCButton() override; | 21 | ~GCButton() override; |
| @@ -30,13 +30,13 @@ public: | |||
| 30 | private: | 30 | private: |
| 31 | const int port; | 31 | const int port; |
| 32 | const int button; | 32 | const int button; |
| 33 | GCAdapter::Adapter* gcadapter; | 33 | const GCAdapter::Adapter* gcadapter; |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | class GCAxisButton final : public Input::ButtonDevice { | 36 | class GCAxisButton final : public Input::ButtonDevice { |
| 37 | public: | 37 | public: |
| 38 | explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_, | 38 | explicit GCAxisButton(int port_, int axis_, float threshold_, bool trigger_if_greater_, |
| 39 | GCAdapter::Adapter* adapter) | 39 | const GCAdapter::Adapter* adapter) |
| 40 | : port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_), | 40 | : port(port_), axis(axis_), threshold(threshold_), trigger_if_greater(trigger_if_greater_), |
| 41 | gcadapter(adapter), | 41 | gcadapter(adapter), |
| 42 | origin_value(static_cast<float>(adapter->GetOriginValue(port_, axis_))) {} | 42 | origin_value(static_cast<float>(adapter->GetOriginValue(port_, axis_))) {} |
| @@ -60,7 +60,7 @@ private: | |||
| 60 | const int axis; | 60 | const int axis; |
| 61 | float threshold; | 61 | float threshold; |
| 62 | bool trigger_if_greater; | 62 | bool trigger_if_greater; |
| 63 | GCAdapter::Adapter* gcadapter; | 63 | const GCAdapter::Adapter* gcadapter; |
| 64 | const float origin_value; | 64 | const float origin_value; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| @@ -149,8 +149,8 @@ void GCButtonFactory::EndConfiguration() { | |||
| 149 | 149 | ||
| 150 | class GCAnalog final : public Input::AnalogDevice { | 150 | class GCAnalog final : public Input::AnalogDevice { |
| 151 | public: | 151 | public: |
| 152 | GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, GCAdapter::Adapter* adapter, | 152 | GCAnalog(int port_, int axis_x_, int axis_y_, float deadzone_, |
| 153 | float range_) | 153 | const GCAdapter::Adapter* adapter, float range_) |
| 154 | : port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter), | 154 | : port(port_), axis_x(axis_x_), axis_y(axis_y_), deadzone(deadzone_), gcadapter(adapter), |
| 155 | origin_value_x(static_cast<float>(adapter->GetOriginValue(port_, axis_x_))), | 155 | origin_value_x(static_cast<float>(adapter->GetOriginValue(port_, axis_x_))), |
| 156 | origin_value_y(static_cast<float>(adapter->GetOriginValue(port_, axis_y_))), | 156 | origin_value_y(static_cast<float>(adapter->GetOriginValue(port_, axis_y_))), |
| @@ -212,7 +212,7 @@ private: | |||
| 212 | const int axis_x; | 212 | const int axis_x; |
| 213 | const int axis_y; | 213 | const int axis_y; |
| 214 | const float deadzone; | 214 | const float deadzone; |
| 215 | GCAdapter::Adapter* gcadapter; | 215 | const GCAdapter::Adapter* gcadapter; |
| 216 | const float origin_value_x; | 216 | const float origin_value_x; |
| 217 | const float origin_value_y; | 217 | const float origin_value_y; |
| 218 | const float range; | 218 | const float range; |