std::arrays where appropriate, clear q in adapter class, other touch ups

This commit is contained in:
Ameer 2020-06-21 21:15:58 -04:00
parent 5f0fa4cb82
commit 968d631aa5
5 changed files with 15 additions and 27 deletions

View file

@ -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;