summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2019-01-24 20:02:23 -0500
committerGitHub <noreply@github.com>2019-01-24 20:02:23 -0500
commitddb1fbf7017644666f0670d3d8de1b05787c8f96 (patch)
tree68930de37be124b0f1d8f92db9c393aad7de9cb7 /Source/Android/jni/MainAndroid.cpp
parentf64b30156f83a4d3c70c2cc0ebd649967788f990 (diff)
parente15af5077f8c9605248a58e3172c8c1c45bd8589 (diff)
Merge pull request #7500 from zackhow/pointer
Android: Add IR pointer control to touch overlay
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index c606345abe..686053496e 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -107,6 +107,11 @@ void Host_UpdateMainFrame()
void Host_RequestRenderWindowSize(int width, int height)
{
+ // Update touch pointer
+ JNIEnv* env;
+ IDCache::GetJavaVM()->AttachCurrentThread(&env, nullptr);
+ env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetUpdateTouchPointer());
+ IDCache::GetJavaVM()->DetachCurrentThread();
}
bool Host_UINeedsControllerState()
@@ -564,6 +569,13 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestr
s_surf = nullptr;
}
}
+
+JNIEXPORT jfloat JNICALL
+Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameAspectRatio(JNIEnv* env, jobject obj)
+{
+ return g_renderer->CalculateDrawAspectRatio();
+}
+
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimotes(JNIEnv* env,
jobject obj)
{
@@ -571,6 +583,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimo
WiimoteReal::Refresh();
}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReloadWiimoteConfig(JNIEnv* env,
+ jobject obj)
+{
+ Wiimote::LoadConfig();
+}
+
static void Run(const std::vector<std::string>& paths, bool first_open,
std::optional<std::string> savestate_path = {}, bool delete_savestate = false)
{