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

[Status Bar] Tweak duration of some messages 

Makes debugging with CPU profiling much more pleasant
This commit is contained in:
oddMLan 2019-04-20 13:19:01 -07:00
parent 61465ce2a5
commit cfbc2ee75e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64-core/N64System/N64Class.cpp
View File

@ -658,7 +658,7 @@ void CN64System::StartEmulation2(bool NewThread)
else else
{ {
//mark the emulation as starting and fix up menus //mark the emulation as starting and fix up menus
g_Notify->DisplayMessage(5, MSG_EMULATION_STARTED); g_Notify->DisplayMessage(2, MSG_EMULATION_STARTED);
WriteTrace(TraceN64System, TraceDebug, "Start Executing CPU"); WriteTrace(TraceN64System, TraceDebug, "Start Executing CPU");
ExecuteCPU(); ExecuteCPU();
} }
@ -704,7 +704,7 @@ void CN64System::Pause()
g_Settings->SaveBool(GameRunning_CPU_Paused, (uint32_t)false); g_Settings->SaveBool(GameRunning_CPU_Paused, (uint32_t)false);
if (pause_type == PauseType_FromMenu) if (pause_type == PauseType_FromMenu)
{ {
g_Notify->DisplayMessage(5, MSG_CPU_RESUMED); g_Notify->DisplayMessage(2, MSG_CPU_RESUMED);
} }
} }
@ -1088,7 +1088,7 @@ void CN64System::ExecuteCPU()
//reset code //reset code
g_Settings->SaveBool(GameRunning_CPU_Paused, false); g_Settings->SaveBool(GameRunning_CPU_Paused, false);
g_Settings->SaveBool(GameRunning_CPU_Running, true); g_Settings->SaveBool(GameRunning_CPU_Running, true);
g_Notify->DisplayMessage(5, MSG_EMULATION_STARTED); g_Notify->DisplayMessage(2, MSG_EMULATION_STARTED);
m_EndEmulation = false; m_EndEmulation = false;
@ -1751,7 +1751,7 @@ bool CN64System::SaveState()
{ {
SaveFile = ZipFile; SaveFile = ZipFile;
} }
g_Notify->DisplayMessage(5, stdstr_f("%s %s", g_Lang->GetString(MSG_SAVED_STATE).c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str()); g_Notify->DisplayMessage(3, stdstr_f("%s %s", g_Lang->GetString(MSG_SAVED_STATE).c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
WriteTrace(TraceN64System, TraceDebug, "Done"); WriteTrace(TraceN64System, TraceDebug, "Done");
return true; return true;
} }
@ -1934,7 +1934,7 @@ bool CN64System::LoadState(const char * FileName)
CFile hSaveFile(SaveFile, CFileBase::modeRead); CFile hSaveFile(SaveFile, CFileBase::modeRead);
if (!hSaveFile.IsOpen()) if (!hSaveFile.IsOpen())
{ {
g_Notify->DisplayMessage(5, stdstr_f("%s %s", GS(MSG_UNABLED_LOAD_STATE), FileName).c_str()); g_Notify->DisplayMessage(3, stdstr_f("%s %s", GS(MSG_UNABLED_LOAD_STATE), FileName).c_str());
return false; return false;
} }
hSaveFile.SeekToBegin(); hSaveFile.SeekToBegin();
@ -2061,7 +2061,7 @@ bool CN64System::LoadState(const char * FileName)
} }
} }
std::string LoadMsg = g_Lang->GetString(MSG_LOADED_STATE); std::string LoadMsg = g_Lang->GetString(MSG_LOADED_STATE);
g_Notify->DisplayMessage(5, stdstr_f("%s %s", LoadMsg.c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str()); g_Notify->DisplayMessage(3, stdstr_f("%s %s", LoadMsg.c_str(), stdstr(SaveFile.GetNameExtension()).c_str()).c_str());
WriteTrace(TraceN64System, TraceDebug, "Done"); WriteTrace(TraceN64System, TraceDebug, "Done");
return true; return true;
} }

2
Source/Project64-core/N64System/ProfilingClass.cpp
View File

@ -80,7 +80,7 @@ void CProfiling::ShowCPU_Usage()
uint32_t Idel = (uint32_t)(m_Timers[Timer_Idel] * 10000 / TotalTime); uint32_t Idel = (uint32_t)(m_Timers[Timer_Idel] * 10000 / TotalTime);
m_CurrentDisplayCount = MAX_FRAMES; m_CurrentDisplayCount = MAX_FRAMES;
g_Notify->DisplayMessage(0, stdstr_f("r4300i: %d.%02d%% GFX: %d.%02d%% Alist: %d.%02d%% Idle: %d.%02d%%", g_Notify->DisplayMessage(0, stdstr_f("r4300i: %d.%02d%% GFX: %d.%02d%% Alist: %d.%02d%% Idle: %d.%02d%%",
R4300 / 100, R4300 % 100, RSP_Dlist / 100, RSP_Dlist % 100, RSP_Alist / 100, RSP_Alist % 100, Idel / 100, Idel % 100).c_str()); R4300 / 100, R4300 % 100, RSP_Dlist / 100, RSP_Dlist % 100, RSP_Alist / 100, RSP_Alist % 100, Idel / 100, Idel % 100).c_str());
ResetTimers(); ResetTimers();