sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Hook up settings interface

Browse Source
This commit is contained in:
Connor McLaughlin
2020-07-11 03:29:15 +10:00
parent 79841d13e2
commit f9cbc3acfb
12 changed files with 334 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/src/cpp/android_host_interface.h
View File

@ -1,12 +1,13 @@
#pragma once
#include "android_settings_interface.h"
#include "common/event.h"
#include "frontend-common/common_host_interface.h"
#include "frontend-common/ini_settings_interface.h"
#include <array>
#include <atomic>
#include <functional>
#include <jni.h>
#include <memory>
#include <string>
#include <thread>
struct ANativeWindow;
@ -16,7 +17,7 @@ class Controller;
class AndroidHostInterface final : public CommonHostInterface
{
public:
AndroidHostInterface(jobject java_object);
AndroidHostInterface(jobject java_object, jobject context_object);
~AndroidHostInterface() override;
bool Initialize() override;
@ -57,7 +58,7 @@ private:
jobject m_java_object = {};
std::unique_ptr<INISettingsInterface> m_settings_interface;
AndroidSettingsInterface m_settings_interface;
ANativeWindow* m_surface = nullptr;
@ -69,3 +70,9 @@ private:
std::atomic_bool m_emulation_thread_start_result{false};
Common::Event m_emulation_thread_started;
};
namespace AndroidHelpers {
JNIEnv* GetJNIEnv();
AndroidHostInterface* GetNativeClass(JNIEnv* env, jobject obj);
std::string JStringToString(JNIEnv* env, jstring str);
} // namespace AndroidHelpers