diff options
| author | LC <mathew1800@gmail.com> | 2020-09-01 07:25:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 07:25:59 -0400 |
| commit | d17c407f09d7bb84690ecd226d2c5ffb330d3a81 (patch) | |
| tree | 11b03939096d247a28f44be34996df965900a0c6 /Source | |
| parent | 42a7c959e1a0321a625ac67a19d0b97d140478d5 (diff) | |
| parent | 9fe6466c79d9b55990cd554e874eb3a887995ee4 (diff) | |
Merge pull request #9052 from Ebola16/GCAT
Android: Better GCAdapter scanning thread management
Diffstat (limited to 'Source')
3 files changed, 17 insertions, 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 index a07469b888..58c5f0e488 100644 --- 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 final class NativeLibrary public static native void ReloadConfig(); + public static native void UpdateGCAdapterScanThread(); + /** * Initializes the native parts of the app. * diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java index b07a3d2917..322b52f894 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java @@ -232,6 +232,7 @@ public class Settings 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 index f54489a7b0..8393fe53d8 100644 --- 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) { |