djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

better HID service failure handling

Browse Source
This commit is contained in:
isXander
2023-02-11 14:19:08 +00:00
parent d46ead7fee
commit 7b2624c12e
6 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/dev/isxander/controlify/controller/hid/ControllerHIDService.java
View File

@ -21,6 +21,8 @@ public class ControllerHIDService implements HidServicesListener {
private final HidServicesSpecification specification;
private final Queue<Consumer<HidDevice>> deviceQueue;
private boolean disabled = false;
public ControllerHIDService() {
this.deviceQueue = new ArrayDeque<>();
@ -30,13 +32,23 @@ public class ControllerHIDService implements HidServicesListener {
}
public void start() {
var services = HidManager.getHidServices(specification);
services.addHidServicesListener(this);
try {
var services = HidManager.getHidServices(specification);
services.addHidServicesListener(this);
services.start();
services.start();
} catch (HidException e) {
Controlify.LOGGER.error("Failed to start controller HID service!", e);
disabled = true;
}
disabled = true;
}
public void awaitNextController(Consumer<HidDevice> consumer) {
if (disabled) {
consumer.accept(null);
return;
}
deviceQueue.add(consumer);
}
@ -46,7 +58,7 @@ public class ControllerHIDService implements HidServicesListener {
if (isController(device)) {
if (deviceQueue.peek() != null) {
deviceQueue.poll().accept(event.getHidDevice());
deviceQueue.poll().accept(device);
} else {
Controlify.LOGGER.error("Unhandled controller: " + ControllerType.getTypeForHID(new HIDIdentifier(device.getVendorId(), device.getProductId())).friendlyName());
}
@ -59,6 +71,10 @@ public class ControllerHIDService implements HidServicesListener {
return isGenericDesktopControlOrGameControl && isController;
}
public boolean isDisabled() {
return disabled;
}
@Override
public void hidDeviceDetached(HidServicesEvent event) {