git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/common/utility/timer.h b/common/utility/timer.h
index ce399327572e9190ef87d6dfbe27e56523bb2adc..122d0eaaf7033d6868ab64bd8939484ad759c943 100644 (file)
--- a/common/utility/timer.h
+++ b/common/utility/timer.h
@@ -22,7 +22,6 @@
 #define NOMINMAX\r
 \r
 #include <windows.h>\r
-#include <Mmsystem.h>\r
 \r
 namespace caspar {\r
        \r
@@ -30,26 +29,30 @@ class high_prec_timer
 {\r
 public:\r
        high_prec_timer()\r
-               : time_(0)\r
        {\r
+               QueryPerformanceFrequency(&freq_);\r
+               QueryPerformanceCounter(&time_);\r
        }\r
 \r
        // Author: Ryan M. Geiss\r
        // http://www.geisswerks.com/ryan/FAQS/timing.html\r
        void tick(double interval)\r
        {       \r
-               auto t = ::timeGetTime();\r
+               LARGE_INTEGER t;\r
+               QueryPerformanceCounter(&t);\r
 \r
-               if (time_ != 0)\r
+               if (time_.QuadPart != 0)\r
                {\r
-                       auto ticks_to_wait = static_cast<DWORD>(interval*1000.0);\r
-                       bool done = 0;\r
+                       __int64 ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
+                       __int64 done = 0;\r
                        do\r
-                       {                               \r
-                               auto ticks_passed = t - time_;\r
-                               auto ticks_left   = ticks_to_wait - ticks_passed;\r
+                       {\r
+                               QueryPerformanceCounter(&t);\r
+                               \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 < time_)    // time wrap\r
+                               if (t.QuadPart < time_.QuadPart)    // time wrap\r
                                        done = 1;\r
                                if (ticks_passed >= ticks_to_wait)\r
                                        done = 1;\r
@@ -62,14 +65,12 @@ public:
                                        // 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 > 2)\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
                                                        Sleep(0);  // causes thread to give up its timeslice\r
                                }\r
-\r
-                               t = ::timeGetTime();\r
                        }\r
                        while (!done);            \r
                }\r
@@ -77,7 +78,8 @@ public:
                time_ = t;\r
        }               \r
 private:       \r
-       DWORD time_;\r
+       LARGE_INTEGER freq_;\r
+       LARGE_INTEGER time_;\r
 };\r
 \r
 \r