diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-02-07 15:51:33 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-02-07 15:51:33 -0500 |
| commit | 35d7c2bc78007f550474f035c486bcc5f79ef60f (patch) | |
| tree | 862050acf1357424dbd0912dc5937ba1b0601393 /Source/Android/jni/MainAndroid.cpp | |
| parent | 76d614ededd95deb4e6dea774541d26827d5c4cc (diff) | |
| parent | fe53461611d86384478064be6b4297a7c7e437e1 (diff) | |
Merge pull request #3593 from Sonicadvance1/Android_Mayflash_adapter
[Android] Implement support for real Wiimotes with the DolphinBar
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index ffa0eca40a..7d2849c96e 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -27,6 +27,7 @@ #include "Core/Host.h" #include "Core/State.h" #include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/Profiler.h" @@ -632,6 +633,10 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceDestr Renderer::s_ChangedSurface.Wait(); } } +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimotes(JNIEnv *env, jobject obj) +{ + WiimoteReal::Refresh(); +} JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj) { @@ -646,6 +651,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv * UICommon::SetUserDirectory(g_set_userpath); UICommon::Init(); + WiimoteReal::InitAdapterClass(); + // No use running the loop when booting fails if ( BootManager::BootCore( g_filename.c_str() ) ) { |