summaryrefslogtreecommitdiffstats
path: root/src/input_common/gcadapter/gc_adapter.h
diff options
context:
space:
mode:
authorAmeer <aj662@drexel.edu>2020-06-22 03:15:58 +0200
committerAmeer <aj662@drexel.edu>2020-06-22 03:17:46 +0200
commit968d631aa59a0a4e51e219eaa143d2b95593c3e7 (patch)
tree3429728a2848581b869a038a2da6499a2ca36952 /src/input_common/gcadapter/gc_adapter.h
parentfix include thread (diff)
downloadyuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar.gz
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar.bz2
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar.lz
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar.xz
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.tar.zst
yuzu-968d631aa59a0a4e51e219eaa143d2b95593c3e7.zip
Diffstat (limited to '')
-rw-r--r--src/input_common/gcadapter/gc_adapter.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index a32ca0464..cb0dd0ab1 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -96,6 +96,8 @@ public:
std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue();
std::array<GCState, 4>& GetPadState();
+ std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const;
+ std::array<GCState, 4>& GetPadState() const;
private:
/// Singleton instance.
@@ -139,8 +141,7 @@ private:
int current_status = NO_ADAPTER_DETECTED;
libusb_device_handle* usb_adapter_handle = nullptr;
- ControllerTypes adapter_controllers_status[4] = {ControllerTypes::None, ControllerTypes::None,
- ControllerTypes::None, ControllerTypes::None};
+ std::array<ControllerTypes, 4> adapter_controllers_status{};
std::mutex s_mutex;