asserts: update imagefs.txz, change wow64 cpu list, fix trigger mode

longjunyu2 · Aug 5, 2024 · 26b93e6 · 26b93e6
1 parent edef9b5
commit 26b93e6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/app/src/main/assets/imagefs.txz b/app/src/main/assets/imagefs.txz
diff --git 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<Integer> 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
@@ -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
@@ -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;