The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 23:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9052 from Ebola16/GCAT

Browse Source 
Android: Better GCAdapter scanning thread management
This commit is contained in:
LC 2020-09-01 07:25:59 -04:00 committed by GitHub
commit d17c407f09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -376,6 +376,8 @@ public final class NativeLibrary
public static native void ReloadConfig(); public static native void ReloadConfig();
public static native void UpdateGCAdapterScanThread();
/** /**
* Initializes the native parts of the app. * Initializes the native parts of the app.
* *

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
View File

@ -232,6 +232,7 @@ public class Settings
NativeLibrary.ReloadConfig(); NativeLibrary.ReloadConfig();
NativeLibrary.ReloadWiimoteConfig(); NativeLibrary.ReloadWiimoteConfig();
NativeLibrary.ReloadLoggerConfig(); NativeLibrary.ReloadLoggerConfig();
NativeLibrary.UpdateGCAdapterScanThread();
if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS)) if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS))
{ {

14
Source/Android/jni/MainAndroid.cpp
View File

@ -50,6 +50,7 @@
#include "InputCommon/ControllerInterface/Android/Android.h" #include "InputCommon/ControllerInterface/Android/Android.h"
#include "InputCommon/ControllerInterface/Touch/ButtonManager.h" #include "InputCommon/ControllerInterface/Touch/ButtonManager.h"
#include "InputCommon/GCAdapter.h"
#include "UICommon/UICommon.h" #include "UICommon/UICommon.h"
@ -630,6 +631,19 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReloadConfig
SConfig::GetInstance().LoadSettings(); 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, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(JNIEnv* env,
jobject obj) jobject obj)
{ {