diff --git a/app/src/main/assets/imagefs.txz b/app/src/main/assets/imagefs.txz index 775134a6..4ee3255c 100644 --- a/app/src/main/assets/imagefs.txz +++ b/app/src/main/assets/imagefs.txz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ceeb44abb768943fbf7a9abbbcd2c221b873ecdf9ce6287b9f839ae4c06760 -size 130016320 +oid sha256:c82fab20a4016a90b8f9e513021ecf6fbd38bc94c721cea64ec1a3bbd3d3af1f +size 129591404 diff --git a/app/src/main/java/com/winlator/SettingsFragment.java b/app/src/main/java/com/winlator/SettingsFragment.java index a8475697..c2269ca3 100644 --- a/app/src/main/java/com/winlator/SettingsFragment.java +++ b/app/src/main/java/com/winlator/SettingsFragment.java @@ -43,6 +43,7 @@ import com.winlator.core.StringUtils; import com.winlator.core.WineInfo; import com.winlator.core.WineUtils; +import com.winlator.inputcontrols.ExternalController; import com.winlator.xenvironment.ImageFs; import org.json.JSONArray; @@ -139,7 +140,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {} final RadioGroup rgTriggerMode = view.findViewById(R.id.RGTriggerMode); List triggerRbIds = List.of(R.id.RBTriggerAsButton, R.id.RBTriggerAsAxis, R.id.RBTriggerAsBoth); - int triggerMode = preferences.getInt("trigger_mode", 2); + int triggerMode = preferences.getInt("trigger_mode", ExternalController.TRIGGER_AS_AXIS); if (triggerMode >= 0 && triggerMode < triggerRbIds.size()) { ((RadioButton) (rgTriggerMode.findViewById(triggerRbIds.get(triggerMode)))).setChecked(true); diff --git a/app/src/main/java/com/winlator/container/Container.java b/app/src/main/java/com/winlator/container/Container.java index 0f4a3636..2c639519 100644 --- a/app/src/main/java/com/winlator/container/Container.java +++ b/app/src/main/java/com/winlator/container/Container.java @@ -453,9 +453,10 @@ public static String getFallbackCPUList() { } public static String getFallbackCPUListWoW64() { - String cpuList = ""; - int numProcessors = Runtime.getRuntime().availableProcessors(); - for (int i = numProcessors / 2; i < numProcessors; i++) cpuList += (!cpuList.isEmpty() ? "," : "")+i; - return cpuList; +// String cpuList = ""; +// int numProcessors = Runtime.getRuntime().availableProcessors(); +// for (int i = numProcessors / 2; i < numProcessors; i++) cpuList += (!cpuList.isEmpty() ? "," : "")+i; +// return cpuList; + return getFallbackCPUList(); } } diff --git a/app/src/main/java/com/winlator/inputcontrols/GamepadState.java b/app/src/main/java/com/winlator/inputcontrols/GamepadState.java index 44f55893..37234a98 100644 --- a/app/src/main/java/com/winlator/inputcontrols/GamepadState.java +++ b/app/src/main/java/com/winlator/inputcontrols/GamepadState.java @@ -1,10 +1,6 @@ package com.winlator.inputcontrols; -import android.util.Log; - import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.Arrays; public class GamepadState { public float thumbLX = 0;