Merge pull request #9052 from Ebola16/GCAT

Android: Better GCAdapter scanning thread management
dolphin-emu · Sep 1, 2020 · d17c407 · d17c407
2 parents 42a7c95 + 9fe6466
commit d17c407
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -376,6 +376,8 @@ public static native String GetConfig(String configFile, String Section, String
 
   public static native void ReloadConfig();
 
+  public static native void UpdateGCAdapterScanThread();
+
   /**
    * Initializes the native parts of the app.
    *

diff --git a/...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -232,6 +232,7 @@ public void saveSettings(SettingsActivityView view, Context context, Set<String>
       NativeLibrary.ReloadConfig();
       NativeLibrary.ReloadWiimoteConfig();
       NativeLibrary.ReloadLoggerConfig();
+      NativeLibrary.UpdateGCAdapterScanThread();
 
       if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS))
       {

diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
@@ -50,6 +50,7 @@
 
 #include "InputCommon/ControllerInterface/Android/Android.h"
 #include "InputCommon/ControllerInterface/Touch/ButtonManager.h"
+#include "InputCommon/GCAdapter.h"
 
 #include "UICommon/UICommon.h"
 
@@ -630,6 +631,19 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReloadConfig
   SConfig::GetInstance().LoadSettings();
 }
 
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_NativeLibrary_UpdateGCAdapterScanThread(JNIEnv* env, jobject obj)
+{
+  if (GCAdapter::UseAdapter())
+  {
+    GCAdapter::StartScanThread();
+  }
+  else
+  {
+    GCAdapter::StopScanThread();
+  }
+}
+
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(JNIEnv* env,
                                                                                jobject obj)
 {