diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-09 17:49:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 17:49:25 +0100 |
commit | 7ec7ff0f303504950e4270e91076a33efd0ceb17 (patch) | |
tree | 1e8346f775550eefd491aa8280412d86000dd637 /src/android/app/src/main/jni/native.h | |
parent | Merge pull request #12927 from german77/cheat-pause (diff) | |
parent | android: Run OnEmulationStarted frontend callback in another thread (diff) | |
download | yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar.gz yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar.bz2 yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar.lz yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar.xz yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.tar.zst yuzu-7ec7ff0f303504950e4270e91076a33efd0ceb17.zip |
Diffstat (limited to 'src/android/app/src/main/jni/native.h')
-rw-r--r-- | src/android/app/src/main/jni/native.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.h index e49d4e015..47936e305 100644 --- a/src/android/app/src/main/jni/native.h +++ b/src/android/app/src/main/jni/native.h @@ -2,13 +2,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include <android/native_window_jni.h> +#include "common/android/applets/software_keyboard.h" #include "common/detached_tasks.h" #include "core/core.h" #include "core/file_sys/registered_cache.h" #include "core/hle/service/acc/profile_manager.h" #include "core/perf_stats.h" #include "frontend_common/content_manager.h" -#include "jni/applets/software_keyboard.h" #include "jni/emu_window/emu_window.h" #include "video_core/rasterizer_interface.h" @@ -54,7 +54,7 @@ public: void SetDeviceType([[maybe_unused]] int index, int type); void OnGamepadConnectEvent([[maybe_unused]] int index); void OnGamepadDisconnectEvent([[maybe_unused]] int index); - SoftwareKeyboard::AndroidKeyboard* SoftwareKeyboard(); + Common::Android::SoftwareKeyboard::AndroidKeyboard* SoftwareKeyboard(); static void OnEmulationStarted(); @@ -79,7 +79,7 @@ private: Core::SystemResultStatus m_load_result{Core::SystemResultStatus::ErrorNotInitialized}; std::atomic<bool> m_is_running = false; std::atomic<bool> m_is_paused = false; - SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{}; + Common::Android::SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{}; std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider; int m_applet_id{1}; |