piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from Sonicadvance1/Fix-AndroidInput

Browse Source 
[Android] Fixes a bunch of input bugs.
This commit is contained in:
shuffle2
2014-05-30 15:32:08 -07:00
parent 8fc83d8ffc e1bbda1e18
commit d0201335c6
9 changed files with 138 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -236,14 +236,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulatio
Core::Stop();
updateMainFrameEvent.Set(); // Kick the waiting event
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchEvent(JNIEnv *env, jobject obj, jint padID, jint Button, jint Action)
{
ButtonManager::TouchEvent(padID, (ButtonManager::ButtonType)Button, Action);
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchAxisEvent(JNIEnv *env, jobject obj, jint padID, jint Button, jfloat Action)
{
ButtonManager::TouchAxisEvent(padID, (ButtonManager::ButtonType)Button, Action);
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
{
ButtonManager::GamepadEvent(GetJString(env, jDevice), Button, Action);