diff options
| author | 2023-06-23 09:48:02 -0400 | |
|---|---|---|
| committer | 2023-06-23 10:36:30 -0400 | |
| commit | a58a1403ba62f27f67ece97eadc0136834afbe29 (patch) | |
| tree | 456fdab8df5c7e929d77f88f943c2b042698393f /src | |
| parent | Merge pull request #10811 from 8bitDream/pip_mute (diff) | |
| download | yuzu-a58a1403ba62f27f67ece97eadc0136834afbe29.tar.gz yuzu-a58a1403ba62f27f67ece97eadc0136834afbe29.tar.xz yuzu-a58a1403ba62f27f67ece97eadc0136834afbe29.zip | |
android: Parameter types from Android Studio
Android Studio marked these parameters as errors because it is an instance, not a class, that is being passed from Java.
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index d576aac50..5d6d61f68 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp | |||
| @@ -528,23 +528,24 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath) { | |||
| 528 | 528 | ||
| 529 | extern "C" { | 529 | extern "C" { |
| 530 | 530 | ||
| 531 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jclass clazz, jobject surf) { | 531 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance, |
| 532 | jobject surf) { | ||
| 532 | EmulationSession::GetInstance().SetNativeWindow(ANativeWindow_fromSurface(env, surf)); | 533 | EmulationSession::GetInstance().SetNativeWindow(ANativeWindow_fromSurface(env, surf)); |
| 533 | EmulationSession::GetInstance().SurfaceChanged(); | 534 | EmulationSession::GetInstance().SurfaceChanged(); |
| 534 | } | 535 | } |
| 535 | 536 | ||
| 536 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jclass clazz) { | 537 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) { |
| 537 | ANativeWindow_release(EmulationSession::GetInstance().NativeWindow()); | 538 | ANativeWindow_release(EmulationSession::GetInstance().NativeWindow()); |
| 538 | EmulationSession::GetInstance().SetNativeWindow(nullptr); | 539 | EmulationSession::GetInstance().SetNativeWindow(nullptr); |
| 539 | EmulationSession::GetInstance().SurfaceChanged(); | 540 | EmulationSession::GetInstance().SurfaceChanged(); |
| 540 | } | 541 | } |
| 541 | 542 | ||
| 542 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jclass clazz, | 543 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance, |
| 543 | jstring j_directory) { | 544 | jstring j_directory) { |
| 544 | Common::FS::SetAppDirectory(GetJString(env, j_directory)); | 545 | Common::FS::SetAppDirectory(GetJString(env, j_directory)); |
| 545 | } | 546 | } |
| 546 | 547 | ||
| 547 | int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jclass clazz, | 548 | int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance, |
| 548 | jstring j_file) { | 549 | jstring j_file) { |
| 549 | return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file)); | 550 | return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file)); |
| 550 | } | 551 | } |