From 3b48b20b7b77beab3ae36e973e3390dafa4e3e86 Mon Sep 17 00:00:00 2001
From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sat, 3 Sep 2011 20:38:44 +0000
Subject: [PATCH] git-svn-id:
 https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1340
 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

---
 common/utility/timer.h | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/common/utility/timer.h b/common/utility/timer.h
index ce3993275..122d0eaaf 100644
--- a/common/utility/timer.h
+++ b/common/utility/timer.h
@@ -22,7 +22,6 @@
 #define NOMINMAX
 
 #include <windows.h>
-#include <Mmsystem.h>
 
 namespace caspar {
 	
@@ -30,26 +29,30 @@ class high_prec_timer
 {
 public:
 	high_prec_timer()
-		: time_(0)
 	{
+		QueryPerformanceFrequency(&freq_);
+		QueryPerformanceCounter(&time_);
 	}
 
 	// Author: Ryan M. Geiss
 	// http://www.geisswerks.com/ryan/FAQS/timing.html
 	void tick(double interval)
 	{     	
-		auto t = ::timeGetTime();
+		LARGE_INTEGER t;
+		QueryPerformanceCounter(&t);
 
-		if (time_ != 0)
+		if (time_.QuadPart != 0)
 		{
-			auto ticks_to_wait = static_cast<DWORD>(interval*1000.0);
-			bool done = 0;
+			__int64 ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);
+			__int64 done = 0;
 			do
-			{				
-				auto ticks_passed = t - time_;
-				auto ticks_left	  = ticks_to_wait - ticks_passed;
+			{
+				QueryPerformanceCounter(&t);
+				
+				__int64 ticks_passed = static_cast<__int64>(t.QuadPart) - static_cast<__int64>(time_.QuadPart);
+				__int64 ticks_left = ticks_to_wait - ticks_passed;
 
-				if (t < time_)    // time wrap
+				if (t.QuadPart < time_.QuadPart)    // time wrap
 					done = 1;
 				if (ticks_passed >= ticks_to_wait)
 					done = 1;
@@ -62,14 +65,12 @@ public:
 					// otherwise, do a few Sleep(0)'s, which just give up the timeslice,
 					//   but don't really save cpu or battery, but do pass a tiny
 					//   amount of time.
-					if (ticks_left > 2)
+					if (ticks_left > static_cast<__int64>((freq_.QuadPart*2)/1000))
 						Sleep(1);
 					else                        
 						for (int i = 0; i < 10; ++i) 
 							Sleep(0);  // causes thread to give up its timeslice
 				}
-
-				t = ::timeGetTime();
 			}
 			while (!done);            
 		}
@@ -77,7 +78,8 @@ public:
 		time_ = t;
 	}		
 private:	
-	DWORD time_;
+	LARGE_INTEGER freq_;
+	LARGE_INTEGER time_;
 };
 
 
-- 
2.39.2