The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-26 19:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow WiimoteControllerProvider to receive L2CapWiimotes

Browse Source
This commit is contained in:
capitalistspz 2024-09-26 01:42:24 +01:00
parent 34f08a4edf
commit ee60171b26
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/api/Wiimote/WiimoteControllerProvider.cpp
View File

@ -4,6 +4,10 @@
#include "input/api/Wiimote/hidapi/HidapiWiimote.h" #include "input/api/Wiimote/hidapi/HidapiWiimote.h"
#if BOOST_OS_LINUX
#include "input/api/Wiimote/l2cap/L2CapWiimote.h"
#endif
#include <numbers> #include <numbers>
#include <queue> #include <queue>
@ -45,7 +49,12 @@ std::vector<std::shared_ptr<ControllerBase>> WiimoteControllerProvider::get_cont
return writeable && not_already_connected; return writeable && not_already_connected;
}; };
for (auto& device : WiimoteDevice_t::get_devices()) auto devices = HidapiWiimote::get_devices();
#if BOOST_OS_LINUX
const auto& l2capDevices = L2CapWiimote::get_devices();
std::ranges::copy(l2capDevices, std::back_inserter(devices));
#endif
for (auto& device : devices)
{ {
if (!valid_new_device(device)) if (!valid_new_device(device))
continue; continue;

2
src/input/api/Wiimote/hidapi/HidapiWiimote.h
View File

@ -19,5 +19,3 @@ private:
const std::string m_path; const std::string m_path;
}; };
using WiimoteDevice_t = HidapiWiimote;

11
src/input/api/Wiimote/l2cap/L2CapWiimote.cpp
View File

@ -2,7 +2,7 @@
#include <bluetooth/l2cap.h> #include <bluetooth/l2cap.h>
namespace { namespace {
// TODO: Add procedure to get addresses. Should add to PairingDialog // TODO: Get addresses upon user request via PairingDialog
std::vector<bdaddr_t> s_address; std::vector<bdaddr_t> s_address;
std::mutex s_addressMutex; std::mutex s_addressMutex;
@ -39,6 +39,12 @@ L2CapWiimote::~L2CapWiimote()
::close(m_sendFd); ::close(m_sendFd);
} }
void L2CapWiimote::AddCandidateAddresses(const std::vector<bdaddr_t>& addrs)
{
std::scoped_lock lock(s_addressMutex);
std::ranges::copy(addrs, std::back_inserter(s_address));
}
std::vector<WiimoteDevicePtr> L2CapWiimote::get_devices() std::vector<WiimoteDevicePtr> L2CapWiimote::get_devices()
{ {
s_addressMutex.lock(); s_addressMutex.lock();
@ -123,5 +129,4 @@ bool L2CapWiimote::operator==(WiimoteDevice& rhs) const
if (!mote) if (!mote)
return false; return false;
return m_recvFd == mote->m_recvFd || m_recvFd == mote->m_sendFd; return m_recvFd == mote->m_recvFd || m_recvFd == mote->m_sendFd;
} }

1
src/input/api/Wiimote/l2cap/L2CapWiimote.h
View File

@ -12,6 +12,7 @@ class L2CapWiimote : public WiimoteDevice
std::optional<std::vector<uint8>> read_data() override; std::optional<std::vector<uint8>> read_data() override;
bool operator==(WiimoteDevice& o) const override; bool operator==(WiimoteDevice& o) const override;
static void AddCandidateAddresses(const std::vector<bdaddr_t>& addrs);
static std::vector<WiimoteDevicePtr> get_devices(); static std::vector<WiimoteDevicePtr> get_devices();
private: private:
int m_recvFd; int m_recvFd;