From ac0e2cce53c078235331f00dc79b65d333c90e76 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 30 Aug 2014 09:18:23 +0200
Subject: use our own clock_gettime on win32

---
 facetracknoir/timer.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'facetracknoir/timer.hpp')

diff --git a/facetracknoir/timer.hpp b/facetracknoir/timer.hpp
index e3fa38de..24d62e37 100644
--- a/facetracknoir/timer.hpp
+++ b/facetracknoir/timer.hpp
@@ -2,8 +2,7 @@
 #include <time.h>
 #if defined (_WIN32)
 #   include <windows.h>
-#   define CLOCK_MONOTONIC 0
-static inline void clock_gettime(int, struct timespec* ts)
+static inline void opentrack_clock_gettime(int, struct timespec* ts)
 {
     static LARGE_INTEGER freq;
 
@@ -20,7 +19,7 @@ static inline void clock_gettime(int, struct timespec* ts)
     ts->tv_sec = d.QuadPart / 1000000000L;
     ts->tv_nsec = d.QuadPart % 1000000000L;
 }
-
+#	define clock_gettime opentrack_clock_gettime
 #else
 #   if defined(__MACH__)
 #       define CLOCK_MONOTONIC 0
-- 
cgit v1.2.3


From 460eb42ae913700903df7b25d50282397da95395 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 22 Sep 2014 23:37:28 +0200
Subject: fix timer uninitialized memory access

---
 facetracknoir/timer.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'facetracknoir/timer.hpp')

diff --git a/facetracknoir/timer.hpp b/facetracknoir/timer.hpp
index 24d62e37..d2df1efd 100644
--- a/facetracknoir/timer.hpp
+++ b/facetracknoir/timer.hpp
@@ -53,8 +53,8 @@ public:
     long start() {
         struct timespec cur;
         (void) clock_gettime(CLOCK_MONOTONIC, &cur);
-        int ret = conv(cur);
         state = cur;
+        int ret = conv(cur);
         return ret;
     }
     long elapsed() {
-- 
cgit v1.2.3


From cdbb9238b898369e778f546272ed563636f1fdb0 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 24 Sep 2014 17:54:28 +0200
Subject: timer: convert to ms on demand

---
 facetracknoir/timer.hpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'facetracknoir/timer.hpp')

diff --git a/facetracknoir/timer.hpp b/facetracknoir/timer.hpp
index d2df1efd..8eb6b943 100644
--- a/facetracknoir/timer.hpp
+++ b/facetracknoir/timer.hpp
@@ -62,4 +62,7 @@ public:
         (void) clock_gettime(CLOCK_MONOTONIC, &cur);
         return conv(cur);
     }
+    long elapsed_ms() {
+        return elapsed() / 1000000L;
+    }
 };
-- 
cgit v1.2.3


From 3f6e60abec9285e803b0e2b380e3fea490b6e392 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 11 Oct 2014 20:26:54 +0200
Subject: time.h -> ctime

---
 facetracknoir/timer.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'facetracknoir/timer.hpp')

diff --git a/facetracknoir/timer.hpp b/facetracknoir/timer.hpp
index 8eb6b943..35ccd4cc 100644
--- a/facetracknoir/timer.hpp
+++ b/facetracknoir/timer.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <time.h>
+#include <ctime>
 #if defined (_WIN32)
 #   include <windows.h>
 static inline void opentrack_clock_gettime(int, struct timespec* ts)
-- 
cgit v1.2.3