*/\r
#pragma once\r
\r
+#define NOMINMAX\r
+\r
#include <windows.h>\r
\r
namespace caspar {\r
\r
-class timer\r
-{\r
-public:\r
- timer() : time_(timeGetTime()){}\r
-\r
- double elapsed()\r
- {\r
- return static_cast<double>(timeGetTime() - time_)/1000.0;\r
- }\r
- \r
- void reset()\r
- {\r
- time_ = timeGetTime();\r
- }\r
- \r
-private: \r
- DWORD time_;\r
-};\r
-\r
class high_prec_timer\r
{\r
public:\r
\r
if (time_.QuadPart != 0)\r
{\r
- int ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
- int done = 0;\r
+ __int64 ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
+ __int64 done = 0;\r
do\r
{\r
QueryPerformanceCounter(&t);\r
\r
- int ticks_passed = static_cast<int>(static_cast<__int64>(t.QuadPart) - static_cast<__int64>(time_.QuadPart));\r
- int ticks_left = ticks_to_wait - ticks_passed;\r
+ __int64 ticks_passed = static_cast<__int64>(t.QuadPart) - static_cast<__int64>(time_.QuadPart);\r
+ __int64 ticks_left = ticks_to_wait - ticks_passed;\r
\r
if (t.QuadPart < time_.QuadPart) // time wrap\r
done = 1;\r
// otherwise, do a few Sleep(0)'s, which just give up the timeslice,\r
// but don't really save cpu or battery, but do pass a tiny\r
// amount of time.\r
- if (ticks_left > static_cast<int>((freq_.QuadPart*2)/1000))\r
+ if (ticks_left > static_cast<__int64>((freq_.QuadPart*2)/1000))\r
Sleep(1);\r
else \r
for (int i = 0; i < 10; ++i) \r