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

[Project64] Remove usage of windows.h from FramePerSecondClass on non windows

This commit is contained in:
zilmar 2016-01-18 19:51:12 +11:00
parent a44626855f
commit e5fe71278a
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Project64-core/N64System/FramePerSecondClass.cpp
View File

@ -11,7 +11,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "FramePerSecondClass.h" #include "FramePerSecondClass.h"
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#endif
CFramePerSecond::CFramePerSecond() CFramePerSecond::CFramePerSecond()
{ {
@ -25,9 +27,11 @@ CFramePerSecond::CFramePerSecond()
m_ScreenHertz = 60; m_ScreenHertz = 60;
} }
#ifdef _WIN32
LARGE_INTEGER Freq; LARGE_INTEGER Freq;
QueryPerformanceFrequency(&Freq); QueryPerformanceFrequency(&Freq);
m_Frequency = Freq.QuadPart; m_Frequency = Freq.QuadPart;
#endif
Reset(true); Reset(true);
} }
@ -48,7 +52,9 @@ void CFramePerSecond::Reset(bool ClearDisplay)
} }
if (ClearDisplay) if (ClearDisplay)
{ {
#ifdef _WIN32
g_Notify->DisplayMessage2(""); g_Notify->DisplayMessage2("");
#endif
return; return;
} }
@ -60,6 +66,7 @@ void CFramePerSecond::Reset(bool ClearDisplay)
void CFramePerSecond::UpdateViCounter(void) void CFramePerSecond::UpdateViCounter(void)
{ {
#ifdef _WIN32
if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_PERCENT) if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_PERCENT)
{ {
return; return;
@ -73,10 +80,12 @@ void CFramePerSecond::UpdateViCounter(void)
DisplayViCounter(0); DisplayViCounter(0);
} }
m_CurrentFrame += 1; m_CurrentFrame += 1;
#endif
} }
void CFramePerSecond::DisplayViCounter(uint32_t FrameRate) void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
{ {
#ifdef _WIN32
if (m_iFrameRateType == FR_VIs) if (m_iFrameRateType == FR_VIs)
{ {
if (FrameRate != 0) if (FrameRate != 0)
@ -87,7 +96,7 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
{ {
if (m_CurrentFrame > (NoOfFrames << 3)) if (m_CurrentFrame > (NoOfFrames << 3))
{ {
__int64 Total; int64_t Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count++) for (int count = 0; count < NoOfFrames; count++)
@ -113,7 +122,7 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
{ {
if (m_CurrentFrame > (NoOfFrames << 3)) if (m_CurrentFrame > (NoOfFrames << 3))
{ {
__int64 Total; int64_t Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count++) for (int count = 0; count < NoOfFrames; count++)
@ -130,6 +139,7 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
} }
g_Notify->DisplayMessage2(stdstr_f("%.1f %%", Percent * 100).c_str()); g_Notify->DisplayMessage2(stdstr_f("%.1f %%", Percent * 100).c_str());
} }
#endif
} }
void CFramePerSecond::FrameRateTypeChanged(CFramePerSecond * _this) void CFramePerSecond::FrameRateTypeChanged(CFramePerSecond * _this)
@ -146,6 +156,7 @@ void CFramePerSecond::ScreenHertzChanged(CFramePerSecond * _this)
void CFramePerSecond::UpdateDlCounter(void) void CFramePerSecond::UpdateDlCounter(void)
{ {
#ifdef _WIN32
if (m_iFrameRateType != FR_DLs) if (m_iFrameRateType != FR_DLs)
{ {
return; return;
@ -158,10 +169,12 @@ void CFramePerSecond::UpdateDlCounter(void)
DisplayDlCounter(0); DisplayDlCounter(0);
} }
m_CurrentFrame += 1; m_CurrentFrame += 1;
#endif
} }
void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate) void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate)
{ {
#ifdef _WIN32
if (m_iFrameRateType != FR_DLs) if (m_iFrameRateType != FR_DLs)
{ {
return; return;
@ -174,7 +187,7 @@ void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate)
{ {
if (m_CurrentFrame > (NoOfFrames << 2)) if (m_CurrentFrame > (NoOfFrames << 2))
{ {
__int64 Total; int64_t Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count++) for (int count = 0; count < NoOfFrames; count++)
@ -188,4 +201,5 @@ void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate)
g_Notify->DisplayMessage2("DL/s: -.--"); g_Notify->DisplayMessage2("DL/s: -.--");
} }
} }
#endif
} }

7
Source/Project64-core/N64System/FramePerSecondClass.h
View File

@ -24,13 +24,16 @@ public:
void DisplayViCounter(uint32_t FrameRate); void DisplayViCounter(uint32_t FrameRate);
private: private:
CFramePerSecond(const CFramePerSecond&); // Disable copy constructor
CFramePerSecond& operator=(const CFramePerSecond&); // Disable assignment
static void FrameRateTypeChanged(CFramePerSecond * _this); static void FrameRateTypeChanged(CFramePerSecond * _this);
static void ScreenHertzChanged(CFramePerSecond * _this); static void ScreenHertzChanged(CFramePerSecond * _this);
int m_iFrameRateType, m_ScreenHertz; int32_t m_iFrameRateType, m_ScreenHertz;
enum { NoOfFrames = 7 }; enum { NoOfFrames = 7 };
int64_t m_Frequency, m_Frames[NoOfFrames], m_LastFrame; int64_t m_Frequency, m_Frames[NoOfFrames], m_LastFrame;
int m_CurrentFrame; int32_t m_CurrentFrame;
}; };