history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 21:15:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Get it running again

Browse Source 
Currently settings are not changable.
This commit is contained in:
Connor McLaughlin
2020-07-05 21:31:17 +10:00
parent 729e1b3392
commit a451e7f177
6 changed files with 121 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#pragma once
#include "common/event.h"
#include "core/host_interface.h"
#include "frontend-common/common_host_interface.h"
#include "frontend-common/ini_settings_interface.h"
#include <array>
#include <atomic>
#include <functional>
@ -12,7 +13,7 @@ struct ANativeWindow;
class Controller;
class AndroidHostInterface final : public HostInterface
class AndroidHostInterface final : public CommonHostInterface
{
public:
AndroidHostInterface(jobject java_object);
@ -21,9 +22,14 @@ public:
bool Initialize() override;
void Shutdown() override;
const char* GetFrontendName() const override;
void RequestExit() override;
void ReportError(const char* message) override;
void ReportMessage(const char* message) override;
std::string GetSettingValue(const char* section, const char* key, const char* default_value = "") override;
bool IsEmulationThreadRunning() const { return m_emulation_thread.joinable(); }
bool StartEmulationThread(ANativeWindow* initial_surface, SystemBootParameters boot_params);
void RunOnEmulationThread(std::function<void()> function, bool blocking = false);
@ -37,16 +43,13 @@ public:
protected:
void SetUserDirectory() override;
void LoadSettings() override;
void UpdateInputMap() override;
bool AcquireHostDisplay() override;
void ReleaseHostDisplay() override;
std::unique_ptr<AudioStream> CreateAudioStream(AudioBackend backend) override;
private:
enum : u32
{
NUM_CONTROLLERS = 2
};
void EmulationThreadEntryPoint(ANativeWindow* initial_surface, SystemBootParameters boot_params);
void CreateImGuiContext();
@ -54,6 +57,8 @@ private:
jobject m_java_object = {};
std::unique_ptr<INISettingsInterface> m_settings_interface;
ANativeWindow* m_surface = nullptr;
std::mutex m_callback_mutex;