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

Merge pull request #831 from cxd4/limit0r 

s/limitor/limiter
This commit is contained in:
zilmar 2015-12-15 09:21:33 +11:00
parent 9256356081 32aefd4b10
commit c1a78c2ba8
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ m_CheatsSlectionChanged(false)
{ {
gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60; gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60;
} }
m_Limitor.SetHertz(gameHertz); m_Limiter.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);
} }
@ -1868,7 +1868,7 @@ void CN64System::RefreshScreen()
{ {
if (bShowCPUPer()) { m_CPU_Usage.StartTimer(Timer_Idel); } if (bShowCPUPer()) { m_CPU_Usage.StartTimer(Timer_Idel); }
uint32_t FrameRate; uint32_t FrameRate;
if (m_Limitor.Timer_Process(&FrameRate) && bDisplayFrameRate()) if (m_Limiter.Timer_Process(&FrameRate) && bDisplayFrameRate())
{ {
m_FPS.DisplayViCounter(FrameRate); m_FPS.DisplayViCounter(FrameRate);
m_bCleanFrameBox = true; m_bCleanFrameBox = true;

8
Source/Project64-core/N64System/N64Class.h
View File

@ -26,7 +26,7 @@
#include "ProfilingClass.h" #include "ProfilingClass.h"
#include "CheatClass.h" #include "CheatClass.h"
#include "FramePerSecondClass.h" #include "FramePerSecondClass.h"
#include "SpeedLimitorClass.h" #include "SpeedLimiterClass.h"
typedef std::list<SystemEvent> EVENT_LIST; typedef std::list<SystemEvent> EVENT_LIST;
@ -64,8 +64,8 @@ public:
void ExternalEvent(SystemEvent action); //covers gui interacting and timers etc.. void ExternalEvent(SystemEvent action); //covers gui interacting and timers etc..
void StartEmulation(bool NewThread); void StartEmulation(bool NewThread);
void SyncToAudio(); void SyncToAudio();
void IncreaseSpeed() { m_Limitor.IncreaseSpeed(); } void IncreaseSpeed() { m_Limiter.IncreaseSpeed(); }
void DecreaseSpeed() { m_Limitor.DecreaseSpeed(); } void DecreaseSpeed() { m_Limiter.DecreaseSpeed(); }
void Reset(bool bInitReg, bool ClearMenory); void Reset(bool bInitReg, bool ClearMenory);
void GameReset(); void GameReset();
void PluginReset(); void PluginReset();
@ -147,7 +147,7 @@ private:
CProfiling m_CPU_Usage; //used to track the cpu usage CProfiling m_CPU_Usage; //used to track the cpu usage
CRecompiler * m_Recomp; CRecompiler * m_Recomp;
CAudio m_Audio; CAudio m_Audio;
CSpeedLimitor m_Limitor; CSpeedLimiter m_Limiter;
bool m_InReset; bool m_InReset;
int32_t m_NextTimer; int32_t m_NextTimer;
CSystemTimer m_SystemTimer; CSystemTimer m_SystemTimer;

16
Source/Project64-core/N64System/SpeedLimitorClass.cpp → Source/Project64-core/N64System/SpeedLimiterClass.cpp
View File

@ -9,14 +9,14 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "SpeedLimitorClass.h" #include "SpeedLimiterClass.h"
#include <common/util.h> #include <common/util.h>
#include <Windows.h> #include <Windows.h>
#include <Mmsystem.h> #include <Mmsystem.h>
#pragma comment(lib, "winmm.lib") #pragma comment(lib, "winmm.lib")
CSpeedLimitor::CSpeedLimitor() CSpeedLimiter::CSpeedLimiter()
{ {
m_Frames = 0; m_Frames = 0;
m_LastTime = 0; m_LastTime = 0;
@ -32,28 +32,28 @@ CSpeedLimitor::CSpeedLimitor()
} }
} }
CSpeedLimitor::~CSpeedLimitor() CSpeedLimiter::~CSpeedLimiter()
{ {
TIMECAPS Caps; TIMECAPS Caps;
timeGetDevCaps(&Caps, sizeof(Caps)); timeGetDevCaps(&Caps, sizeof(Caps));
timeEndPeriod(Caps.wPeriodMin); timeEndPeriod(Caps.wPeriodMin);
} }
void CSpeedLimitor::SetHertz(uint32_t Hertz) void CSpeedLimiter::SetHertz(uint32_t Hertz)
{ {
m_Speed = Hertz; m_Speed = Hertz;
m_BaseSpeed = Hertz; m_BaseSpeed = Hertz;
FixSpeedRatio(); FixSpeedRatio();
} }
void CSpeedLimitor::FixSpeedRatio() void CSpeedLimiter::FixSpeedRatio()
{ {
m_Ratio = 1000.0f / static_cast<double>(m_Speed); m_Ratio = 1000.0f / static_cast<double>(m_Speed);
m_Frames = 0; m_Frames = 0;
m_LastTime = timeGetTime(); m_LastTime = timeGetTime();
} }
bool CSpeedLimitor::Timer_Process(uint32_t * FrameRate) bool CSpeedLimiter::Timer_Process(uint32_t * FrameRate)
{ {
m_Frames += 1; m_Frames += 1;
uint32_t CurrentTime = timeGetTime(); uint32_t CurrentTime = timeGetTime();
@ -87,7 +87,7 @@ bool CSpeedLimitor::Timer_Process(uint32_t * FrameRate)
} }
} }
void CSpeedLimitor::IncreaseSpeed() void CSpeedLimiter::IncreaseSpeed()
{ {
if (m_Speed >= 60) if (m_Speed >= 60)
{ {
@ -105,7 +105,7 @@ void CSpeedLimitor::IncreaseSpeed()
FixSpeedRatio(); FixSpeedRatio();
} }
void CSpeedLimitor::DecreaseSpeed() void CSpeedLimiter::DecreaseSpeed()
{ {
if (m_Speed > 60) if (m_Speed > 60)
{ {

10
Source/Project64-core/N64System/SpeedLimitorClass.h → Source/Project64-core/N64System/SpeedLimiterClass.h
View File

@ -12,12 +12,12 @@
#include "../Settings/GameSettings.h" #include "../Settings/GameSettings.h"
class CSpeedLimitor : class CSpeedLimiter :
private CGameSettings private CGameSettings
{ {
public: public:
CSpeedLimitor(); CSpeedLimiter();
~CSpeedLimitor(); ~CSpeedLimiter();
void SetHertz(const uint32_t Hertz); void SetHertz(const uint32_t Hertz);
bool Timer_Process(uint32_t* const FrameRate); bool Timer_Process(uint32_t* const FrameRate);
@ -25,8 +25,8 @@ public:
void DecreaseSpeed(); void DecreaseSpeed();
private: private:
CSpeedLimitor(const CSpeedLimitor&); // Disable copy constructor CSpeedLimiter(const CSpeedLimiter&); // Disable copy constructor
CSpeedLimitor& operator=(const CSpeedLimitor&); // Disable assignment CSpeedLimiter& operator=(const CSpeedLimiter&); // Disable assignment
void FixSpeedRatio(); void FixSpeedRatio();

4
Source/Project64-core/Project64-core.vcproj
View File

@ -330,7 +330,7 @@
> >
</File> </File>
<File <File
RelativePath=".\N64System\SpeedLimitorClass.cpp" RelativePath=".\N64System\SpeedLimiterClass.cpp"
> >
</File> </File>
<File <File
@ -552,7 +552,7 @@
> >
</File> </File>
<File <File
RelativePath=".\N64System\SpeedLimitorClass.h" RelativePath=".\N64System\SpeedLimiterClass.h"
> >
</File> </File>
<File <File

4
Source/Project64-core/Project64-core.vcxproj
View File

@ -73,7 +73,7 @@
<ClCompile Include="N64System\Recompiler\SectionInfo.cpp" /> <ClCompile Include="N64System\Recompiler\SectionInfo.cpp" />
<ClCompile Include="N64System\Recompiler\x86CodeLog.cpp" /> <ClCompile Include="N64System\Recompiler\x86CodeLog.cpp" />
<ClCompile Include="N64System\Recompiler\X86ops.cpp" /> <ClCompile Include="N64System\Recompiler\X86ops.cpp" />
<ClCompile Include="N64System\SpeedLimitorClass.cpp" /> <ClCompile Include="N64System\SpeedLimiterClass.cpp" />
<ClCompile Include="N64System\SystemGlobals.cpp" /> <ClCompile Include="N64System\SystemGlobals.cpp" />
<ClCompile Include="Plugins\AudioPlugin.cpp" /> <ClCompile Include="Plugins\AudioPlugin.cpp" />
<ClCompile Include="Plugins\ControllerPlugin.cpp" /> <ClCompile Include="Plugins\ControllerPlugin.cpp" />
@ -161,7 +161,7 @@
<ClInclude Include="N64System\Recompiler\SectionInfo.h" /> <ClInclude Include="N64System\Recompiler\SectionInfo.h" />
<ClInclude Include="N64System\Recompiler\X86CodeLog.h" /> <ClInclude Include="N64System\Recompiler\X86CodeLog.h" />
<ClInclude Include="N64System\Recompiler\X86ops.h" /> <ClInclude Include="N64System\Recompiler\X86ops.h" />
<ClInclude Include="N64System\SpeedLimitorClass.h" /> <ClInclude Include="N64System\SpeedLimiterClass.h" />
<ClInclude Include="N64System\SystemGlobals.h" /> <ClInclude Include="N64System\SystemGlobals.h" />
<ClInclude Include="Notification.h" /> <ClInclude Include="Notification.h" />
<ClInclude Include="Plugin.h" /> <ClInclude Include="Plugin.h" />

4
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -201,7 +201,7 @@
<ClCompile Include="N64System\ProfilingClass.cpp"> <ClCompile Include="N64System\ProfilingClass.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\SpeedLimitorClass.cpp"> <ClCompile Include="N64System\SpeedLimiterClass.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\SystemGlobals.cpp"> <ClCompile Include="N64System\SystemGlobals.cpp">
@ -560,7 +560,7 @@
<ClInclude Include="Settings\SettingsClass.h"> <ClInclude Include="Settings\SettingsClass.h">
<Filter>Header Files\Settings</Filter> <Filter>Header Files\Settings</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\SpeedLimitorClass.h"> <ClInclude Include="N64System\SpeedLimiterClass.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TraceModulesProject64.h"> <ClInclude Include="TraceModulesProject64.h">

2
Source/Project64/N64System.h
View File

@ -23,7 +23,7 @@
//General Mips Information //General Mips Information
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64RomClass.h>
#include "N64System/RomInformationClass.h" #include "N64System/RomInformationClass.h"
#include <Project64-core/N64System/SpeedLimitorClass.h> #include <Project64-core/N64System/SpeedLimiterClass.h>
#include <Project64-core/N64System/Mips/OpCode.h> #include <Project64-core/N64System/Mips/OpCode.h>
#include <Project64-core/N64System/Recompiler/X86ops.h> #include <Project64-core/N64System/Recompiler/X86ops.h>
#include <Project64-core/N64System/Mips/Mempak.h> #include <Project64-core/N64System/Mips/Mempak.h>

4
Source/Project64/Project64.dsp
View File

@ -539,7 +539,7 @@ SOURCE="N64 System\Rom Information Class.cpp"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE="N64 System\Speed Limitor Class.cpp" SOURCE="N64 System\Speed Limiter Class.cpp"
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -1224,7 +1224,7 @@ SOURCE="N64 System\Rom Information Class.h"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE="N64 System\Speed Limitor Class.h" SOURCE="N64 System\Speed Limiter Class.h"
# End Source File # End Source File
# Begin Source File # Begin Source File