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

[Project64] Change m_hPauseEvent to a sync event

This commit is contained in:
zilmar 2015-11-12 18:08:10 +11:00
parent 66b6be4bd7
commit 5888b1d3f6
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Project64/N64 System/N64 Class.cpp
View File

@ -42,6 +42,7 @@ m_TLBStoreAddress(0),
m_SyncCount(0), m_SyncCount(0),
m_CPU_Handle(NULL), m_CPU_Handle(NULL),
m_CPU_ThreadID(0), m_CPU_ThreadID(0),
m_hPauseEvent(true),
m_CheatsSlectionChanged(false) m_CheatsSlectionChanged(false)
{ {
DWORD gameHertz = g_Settings->LoadDword(Game_ScreenHertz); DWORD gameHertz = g_Settings->LoadDword(Game_ScreenHertz);
@ -49,7 +50,6 @@ m_CheatsSlectionChanged(false)
{ {
gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60; gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60;
} }
m_hPauseEvent = CreateEvent(NULL, true, false, NULL);
m_Limitor.SetHertz(gameHertz); m_Limitor.SetHertz(gameHertz);
g_Settings->SaveDword(GameRunning_ScreenHertz, gameHertz); g_Settings->SaveDword(GameRunning_ScreenHertz, gameHertz);
m_Cheats.LoadCheats(!g_Settings->LoadDword(Setting_RememberCheats), Plugins); m_Cheats.LoadCheats(!g_Settings->LoadDword(Setting_RememberCheats), Plugins);
@ -123,54 +123,54 @@ void CN64System::ExternalEvent(SystemEvent action)
break; break;
case SysEvent_ResumeCPU_FromMenu: case SysEvent_ResumeCPU_FromMenu:
// always resume if from menu // always resume if from menu
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
break; break;
case SysEvent_ResumeCPU_AppGainedFocus: case SysEvent_ResumeCPU_AppGainedFocus:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_AppLostFocus) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_AppLostFocus)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_AppGainedActive: case SysEvent_ResumeCPU_AppGainedActive:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_AppLostActive) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_AppLostActive)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_SaveGame: case SysEvent_ResumeCPU_SaveGame:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_SaveGame) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_SaveGame)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_LoadGame: case SysEvent_ResumeCPU_LoadGame:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_LoadGame) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_LoadGame)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_DumpMemory: case SysEvent_ResumeCPU_DumpMemory:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_DumpMemory) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_DumpMemory)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_SearchMemory: case SysEvent_ResumeCPU_SearchMemory:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_SearchMemory) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_SearchMemory)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_Settings: case SysEvent_ResumeCPU_Settings:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_Settings) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_Settings)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
case SysEvent_ResumeCPU_Cheats: case SysEvent_ResumeCPU_Cheats:
if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_Cheats) if (g_Settings->LoadDword(GameRunning_CPU_PausedType) == PauseType_Cheats)
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
break; break;
default: default:
@ -420,7 +420,7 @@ void CN64System::CloseCpu()
m_EndEmulation = true; m_EndEmulation = true;
if (g_Settings->LoadBool(GameRunning_CPU_Paused)) if (g_Settings->LoadBool(GameRunning_CPU_Paused))
{ {
SetEvent(m_hPauseEvent); m_hPauseEvent.Trigger();
} }
if (GetCurrentThreadId() == m_CPU_ThreadID) if (GetCurrentThreadId() == m_CPU_ThreadID)
@ -474,12 +474,12 @@ void CN64System::Pause()
{ {
return; return;
} }
ResetEvent(m_hPauseEvent); m_hPauseEvent.Reset();
g_Settings->SaveBool(GameRunning_CPU_Paused, true); g_Settings->SaveBool(GameRunning_CPU_Paused, true);
Notify().RefreshMenu(); Notify().RefreshMenu();
g_Notify->DisplayMessage(5, MSG_CPU_PAUSED); g_Notify->DisplayMessage(5, MSG_CPU_PAUSED);
WaitForSingleObject(m_hPauseEvent, INFINITE); m_hPauseEvent.IsTriggered(SyncEvent::INFINITE_TIMEOUT);
ResetEvent(m_hPauseEvent); m_hPauseEvent.Reset();
g_Settings->SaveBool(GameRunning_CPU_Paused, (DWORD)false); g_Settings->SaveBool(GameRunning_CPU_Paused, (DWORD)false);
Notify().RefreshMenu(); Notify().RefreshMenu();
Notify().DisplayMessage(5, MSG_CPU_RESUMED); Notify().DisplayMessage(5, MSG_CPU_RESUMED);
@ -946,12 +946,6 @@ void CN64System::CpuStopped()
Notify().WindowMode(); Notify().WindowMode();
if (!m_InReset) if (!m_InReset)
{ {
if (m_hPauseEvent)
{
CloseHandle(m_hPauseEvent);
m_hPauseEvent = NULL;
}
Notify().RefreshMenu(); Notify().RefreshMenu();
Notify().MakeWindowOnTop(false); Notify().MakeWindowOnTop(false);
g_Notify->DisplayMessage(5, MSG_EMULATION_ENDED); g_Notify->DisplayMessage(5, MSG_EMULATION_ENDED);

2
Source/Project64/N64 System/N64 Class.h
View File

@ -10,6 +10,8 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <Common/SyncEvent.h>
typedef std::list<SystemEvent> EVENT_LIST; typedef std::list<SystemEvent> EVENT_LIST;
typedef std::map<DWORD, DWORD> FUNC_CALLS; typedef std::map<DWORD, DWORD> FUNC_CALLS;