Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collect DInput devices in a meta device

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-06-28 13:57:04 +02:00
1 parent ce64ae2f7b
commit 66785a724b
4 files changed
+45 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/DinputDevice.cpp
+32 -10
View File
@@ -241,7 +241,7 @@ int DinputDevice::UpdateState() {
|| js.lVX != 0 || js.lVY != 0 || js.lVZ != 0 || js.lVRx != 0 || js.lVRy != 0 || js.lVRz != 0)
{
pPrevState = js;
return UPDATESTATE_SKIP_PAD;
return InputDevice::UPDATESTATE_SKIP_PAD;
}
return -1;
}
@@ -312,12 +312,6 @@ size_t DinputDevice::getNumPads()
static std::set<u32> DetectXInputVIDPIDs() {
std::set<u32> xinputVidPids;
/*
if (FAILED(CoInitializeEx(nullptr, COINIT_MULTITHREADED))) {
return xinputVidPids;
}
*/
IWbemLocator* pIWbemLocator = nullptr;
if (FAILED(CoCreateInstance(__uuidof(WbemLocator), nullptr, CLSCTX_INPROC_SERVER,
__uuidof(IWbemLocator), (void**)&pIWbemLocator)))
@@ -340,10 +334,10 @@ static std::set<u32> DetectXInputVIDPIDs() {
return xinputVidPids;
}
IWbemClassObject* pDevices[20] = { 0 };
IWbemClassObject* pDevices[32] = { 0 };
ULONG uReturned = 0;
while (SUCCEEDED(pEnumDevices->Next(10000, 20, pDevices, &uReturned)) && uReturned > 0) {
while (SUCCEEDED(pEnumDevices->Next(10000, 32, pDevices, &uReturned)) && uReturned > 0) {
for (ULONG i = 0; i < uReturned; i++) {
VARIANT var;
if (SUCCEEDED(pDevices[i]->Get(L"DeviceID", 0, &var, nullptr, nullptr)))
@@ -369,7 +363,35 @@ static std::set<u32> DetectXInputVIDPIDs() {
pEnumDevices->Release();
pIWbemServices->Release();
pIWbemLocator->Release();
// CoUninitialize();
return xinputVidPids;
}
DInputMetaDevice::DInputMetaDevice() {
//find all connected DInput devices of class GamePad
numDinputDevices_ = DinputDevice::getNumPads();
for (size_t i = 0; i < numDinputDevices_; i++) {
devices_.push_back(std::make_unique<DinputDevice>(static_cast<int>(i)));
}
}
int DInputMetaDevice::UpdateState() {
static const int CHECK_FREQUENCY = 71; // Just an arbitrary prime to try to not collide with other periodic checks.
if (checkCounter_++ > CHECK_FREQUENCY) {
const size_t newCount = DinputDevice::getNumPads();
if (newCount > numDinputDevices_) {
INFO_LOG(Log::System, "New controller device detected");
for (size_t i = numDinputDevices_; i < newCount; i++) {
devices_.push_back(std::make_unique<DinputDevice>(static_cast<int>(i)));
}
numDinputDevices_ = newCount;
}
checkCounter_ = 0;
}
for (const auto &device : devices_) {
if (device->UpdateState() == InputDevice::UPDATESTATE_SKIP_PAD)
return InputDevice::UPDATESTATE_SKIP_PAD;
}
return 0;
}