GCAdapter: Automatically start and stop thread

This keeps the logic encapsulated inside GCAdapter.cpp so callers don't
have to think about it.

3 files changed, 0 insertions, 20 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
index 0edc0f91f9..a4d9bac35a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
@@ -300,9 +300,6 @@ object NativeLibrary {
     @JvmStatic
     external fun ResetDolphinSettings()
 
-    @JvmStatic
-    external fun UpdateGCAdapterScanThread()
-
     /**
      * Initializes the native parts of the app.
      *
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt
index 3a6a097642..96d40b214c 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt
@@ -56,7 +56,6 @@ class Settings : Closeable {
             NativeConfig.save(NativeConfig.LAYER_BASE)
 
             NativeLibrary.ReloadLoggerConfig()
-            NativeLibrary.UpdateGCAdapterScanThread()
         } else {
             NativeConfig.save(NativeConfig.LAYER_LOCAL_GAME)
         }
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 7112833403..0e841b6d7e 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -56,8 +56,6 @@
 #include "DiscIO/ScrubbedBlob.h"
 #include "DiscIO/Volume.h"
 
-#include "InputCommon/GCAdapter.h"
-
 #include "UICommon/GameFile.h"
 #include "UICommon/UICommon.h"
 
@@ -533,20 +531,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ResetDolphin
   UICommon::SetUserDirectory(File::GetUserPath(D_USER_IDX));
 }
 
-JNIEXPORT void JNICALL
-Java_org_dolphinemu_dolphinemu_NativeLibrary_UpdateGCAdapterScanThread(JNIEnv*, jclass)
-{
-  HostThreadLock guard;
-  if (GCAdapter::UseAdapter())
-  {
-    GCAdapter::StartScanThread();
-  }
-  else
-  {
-    GCAdapter::StopScanThread();
-  }
-}
-
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(JNIEnv*, jclass)
 {
   HostThreadLock guard;