moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't double count USB attached Xbox One controllers

Browse Source
This commit is contained in:
Cameron Gutman 2019-10-16 19:26:24 -07:00
parent db5b7ab867
commit 7e21638811
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@ -215,9 +215,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
if (PreferenceConfiguration.readPreferences(context).usbDriver) { if (PreferenceConfiguration.readPreferences(context).usbDriver) {
UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
for (UsbDevice dev : usbManager.getDeviceList().values()) { for (UsbDevice dev : usbManager.getDeviceList().values()) {
// We explicitly ask not to claim devices that appear as InputDevices // We explicitly check not to claim devices that appear as InputDevices
// otherwise we will double count them. // otherwise we will double count them.
if (UsbDriverService.shouldClaimDevice(dev, false)) { if (UsbDriverService.shouldClaimDevice(dev, false) &&
!UsbDriverService.isRecognizedInputDevice(dev)) {
LimeLog.info("Counting UsbDevice: "+dev.getDeviceName()); LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
mask |= 1 << count++; mask |= 1 << count++;
} }

2
app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
View File

@ -166,7 +166,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
} }
} }
private static boolean isRecognizedInputDevice(UsbDevice device) { public static boolean isRecognizedInputDevice(UsbDevice device) {
// On KitKat and later, we can determine if this VID and PID combo // On KitKat and later, we can determine if this VID and PID combo
// matches an existing input device and defer to the built-in controller // matches an existing input device and defer to the built-in controller
// support in that case. Prior to KitKat, we'll always return true to be safe. // support in that case. Prior to KitKat, we'll always return true to be safe.