mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
Merge pull request #9052 from Ebola16/GCAT
Android: Better GCAdapter scanning thread management
This commit is contained in:
commit
d17c407f09
@ -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.
|
||||
*
|
||||
|
@ -232,6 +232,7 @@ public class Settings
|
||||
NativeLibrary.ReloadConfig();
|
||||
NativeLibrary.ReloadWiimoteConfig();
|
||||
NativeLibrary.ReloadLoggerConfig();
|
||||
NativeLibrary.UpdateGCAdapterScanThread();
|
||||
|
||||
if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS))
|
||||
{
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user