Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Android: Remove the old limitation of 3 registered input devices.

Browse source
This commit is contained in:
Henrik Rydgård 2021-08-21 23:44:02 +02:00
parent d27517758e
commit 1fc43b4ea2
1 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
android/src/org/ppsspp/ppsspp/NativeActivity.java
View file

@ -108,10 +108,7 @@ public abstract class NativeActivity extends Activity {
// Allow for multiple connected gamepads but just consider them the same for now.
// Actually this is not entirely true, see the code.
private InputDeviceState inputPlayerA;
private InputDeviceState inputPlayerB;
private InputDeviceState inputPlayerC;
private String inputPlayerADesc;
private ArrayList<InputDeviceState> inputPlayers;
private PowerSaveModeReceiver mPowerSaveModeReceiver = null;
private SizeManager sizeManager = null;
@ -918,35 +915,18 @@ public abstract class NativeActivity extends Activity {
if (device == null) {
return null;
}
if (inputPlayerA == null) {
inputPlayerADesc = getInputDesc(device);
Log.i(TAG, "Input player A registered: desc = " + inputPlayerADesc);
inputPlayerA = new InputDeviceState(device);
for (InputDeviceState input : inputPlayers) {
if (input.getDevice() == device) {
return input;
}
}
if (inputPlayerA.getDevice() == device) {
return inputPlayerA;
}
if (inputPlayerB == null) {
Log.i(TAG, "Input player B registered: desc = " + getInputDesc(device));
inputPlayerB = new InputDeviceState(device);
}
if (inputPlayerB.getDevice() == device) {
return inputPlayerB;
}
if (inputPlayerC == null) {
Log.i(TAG, "Input player C registered");
inputPlayerC = new InputDeviceState(device);
}
if (inputPlayerC.getDevice() == device) {
return inputPlayerC;
}
return inputPlayerA;
// None was found, just add and return it.
InputDeviceState state = new InputDeviceState(device);
inputPlayers.add(state);
Log.i(TAG, "Input player registered: desc = " + getInputDesc(device));
return state;
}
public boolean IsXperiaPlay() {