diff options
| author | bushing <bushing@gmail.com> | 2008-12-08 05:30:24 +0000 |
|---|---|---|
| committer | bushing <bushing@gmail.com> | 2008-12-08 05:30:24 +0000 |
| commit | 49cfded60bb5b444d1828190eacc52bbb49a9cb8 (patch) | |
| tree | 0823218c1f2f6eec307dadbdec18c5632625f052 /Source/Core/Common/Src/Timer.cpp | |
| parent | 901fe7c00fec5e2aaf55d184edbcb6d092345d52 (diff) | |
set svn:eol-style=native for **.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1442 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Src/Timer.cpp | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 359c5f9039..152d664416 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -1,99 +1,99 @@ -// Copyright (C) 2003-2008 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifdef _WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-
-#include <time.h>
-
-#include "Common.h"
-#include "Timer.h"
-
-#ifdef __GNUC__
-#include <sys/timeb.h>
-
-u32 timeGetTime()
-{
- struct timeb t;
- ftime(&t);
- return((u32)(t.time * 1000 + t.millitm));
-}
-
-
-#endif
-
-
-namespace Common
-{
-Timer::Timer(void)
- : m_LastTime(0)
-{
- Update();
-
-#ifdef _WIN32
- QueryPerformanceFrequency((LARGE_INTEGER*)&m_frequency);
-#endif
-}
-
-
-void Timer::Update(void)
-{
- m_LastTime = timeGetTime();
- //TODO(ector) - QPF
-}
-
-
-s64 Timer::GetTimeDifference(void)
-{
- return(timeGetTime() - m_LastTime);
-}
-
-
-void Timer::IncreaseResolution()
-{
-#ifdef _WIN32
- timeBeginPeriod(1);
-#endif
-}
-
-
-void Timer::RestoreResolution()
-{
-#ifdef _WIN32
- timeEndPeriod(1);
-#endif
-}
-
-
-#ifdef __GNUC__
-void _time64(u64* t)
-{
- *t = 0; //TODO
-}
-#endif
-
-
-
-u64 Timer::GetTimeSinceJan1970(void)
-{
- time_t ltime;
- time(<ime);
- return((u64)ltime);
-}
-} // end of namespace Common
+// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifdef _WIN32 +#include <windows.h> +#include <mmsystem.h> +#endif + +#include <time.h> + +#include "Common.h" +#include "Timer.h" + +#ifdef __GNUC__ +#include <sys/timeb.h> + +u32 timeGetTime() +{ + struct timeb t; + ftime(&t); + return((u32)(t.time * 1000 + t.millitm)); +} + + +#endif + + +namespace Common +{ +Timer::Timer(void) + : m_LastTime(0) +{ + Update(); + +#ifdef _WIN32 + QueryPerformanceFrequency((LARGE_INTEGER*)&m_frequency); +#endif +} + + +void Timer::Update(void) +{ + m_LastTime = timeGetTime(); + //TODO(ector) - QPF +} + + +s64 Timer::GetTimeDifference(void) +{ + return(timeGetTime() - m_LastTime); +} + + +void Timer::IncreaseResolution() +{ +#ifdef _WIN32 + timeBeginPeriod(1); +#endif +} + + +void Timer::RestoreResolution() +{ +#ifdef _WIN32 + timeEndPeriod(1); +#endif +} + + +#ifdef __GNUC__ +void _time64(u64* t) +{ + *t = 0; //TODO +} +#endif + + + +u64 Timer::GetTimeSinceJan1970(void) +{ + time_t ltime; + time(<ime); + return((u64)ltime); +} +} // end of namespace Common |
