ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Call emulation started

This commit is contained in:
zilmar 2017-04-28 08:36:10 +10:00
parent 67f2a445ae
commit 03f7e4ac94
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Android/Bridge/JavaBridge.cpp
View File

@ -156,6 +156,16 @@ void JavaBridge::EmulationStopped(void)
} }
} }
void JavaBridge::EmulationStarted(void)
{
JNIEnv *env = Android_JNI_GetEnv();
if (g_Activity != NULL && env != NULL)
{
jmethodID midEmulationStarted = env->GetStaticMethodID(m_NotifierClass, "EmulationStarted", "(Landroid/app/Activity;)V");
env->CallStaticVoidMethod(m_NotifierClass, midEmulationStarted, g_Activity);
}
}
void JavaBridge::RecentRomsUpdated(void) void JavaBridge::RecentRomsUpdated(void)
{ {
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();

5
Source/Android/Bridge/JavaBridge.h
View File

@ -9,7 +9,7 @@ class JavaBridge :
public RenderWindow public RenderWindow
{ {
public: public:
JavaBridge (JavaVM* vm); JavaBridge(JavaVM* vm);
//Render window functions //Render window functions
void GfxThreadInit(); void GfxThreadInit();
@ -18,7 +18,7 @@ public:
//Rom List //Rom List
void RomListReset(void); void RomListReset(void);
void RomListAddItem(const char * FullFileName, const char * FileName, const char * GoodName, uint32_t TextColor ); void RomListAddItem(const char * FullFileName, const char * FileName, const char * GoodName, uint32_t TextColor);
void RomListLoaded(void); void RomListLoaded(void);
void RecentRomsUpdated(void); void RecentRomsUpdated(void);
@ -26,6 +26,7 @@ public:
void DisplayError(const char * Message); void DisplayError(const char * Message);
void DisplayMessage(const char * Message, int DisplayTime); void DisplayMessage(const char * Message, int DisplayTime);
void DisplayMessage2(const char * Message); void DisplayMessage2(const char * Message);
void EmulationStarted(void);
void EmulationStopped(void); void EmulationStopped(void);
private: private:

18
Source/Android/Bridge/jniBridge.cpp
View File

@ -231,6 +231,7 @@ void GameCpuRunning(void * /*NotUsed*/)
WriteTrace(TraceUserInterface, TraceDebug, "Start"); WriteTrace(TraceUserInterface, TraceDebug, "Start");
bool Running = g_Settings->LoadBool(GameRunning_CPU_Running); bool Running = g_Settings->LoadBool(GameRunning_CPU_Running);
WriteTrace(TraceUserInterface, TraceDebug, Running ? "Game Started" : "Game Stopped"); WriteTrace(TraceUserInterface, TraceDebug, Running ? "Game Started" : "Game Stopped");
JNIEnv *env = Android_JNI_GetEnv();
if (Running) if (Running)
{ {
stdstr FileLoc = g_Settings->LoadStringVal(Game_File); stdstr FileLoc = g_Settings->LoadStringVal(Game_File);
@ -243,10 +244,25 @@ void GameCpuRunning(void * /*NotUsed*/)
int RunCount = UISettingsLoadDword(Game_RunCount); int RunCount = UISettingsLoadDword(Game_RunCount);
WriteTrace(TraceUserInterface, TraceDebug, "Setting Run Count to %d", RunCount + 1); WriteTrace(TraceUserInterface, TraceDebug, "Setting Run Count to %d", RunCount + 1);
UISettingsSaveDword(Game_RunCount, RunCount + 1); UISettingsSaveDword(Game_RunCount, RunCount + 1);
if (env != NULL)
{
if (g_JavaBridge)
{
WriteTrace(TraceUserInterface, TraceDebug, "Notify java emulation stopped");
g_JavaBridge->EmulationStarted();
}
else
{
WriteTrace(TraceUserInterface, TraceError, "No Java bridge");
}
}
else
{
WriteTrace(TraceUserInterface, TraceError, "Failed to get java environment");
}
} }
else else
{ {
JNIEnv *env = Android_JNI_GetEnv();
if (env != NULL) if (env != NULL)
{ {
if (g_JavaBridge) if (g_JavaBridge)