Windows mods on new threadscan code

diff --git a/player.cc b/player.cc
index ca9657f8b72cc7a02bb2c28471b09d3d1606d1f1..adfc5b755ae1e4db027c8c4aca48cbe0e6c5b026 100644 (file)
--- a/player.cc
+++ b/player.cc
@@ -1020,15 +1020,25 @@ void Player::threadFeedScan()
 
   ULONG iframesep;
 
+#ifndef _MSC_VER
   struct timeval loopTime;
   struct timeval loopTimeN;
+#else
+  DWORD loopTime;
+  DWORD loopTimeN;
+#endif
+
   ULONG realLoopTime;
   ULONG sleepTime = 0;
   UINT offset;
 
   if (state == S_FFWD) direction = 1; // and 0 for backward
 
-  gettimeofday(&loopTime, NULL);
+  #ifndef WIN32
+    gettimeofday(&loopTime, NULL);
+  #else
+    loopTime = timeGetTime();
+  #endif
 
   while(1)
   {
@@ -1043,10 +1053,16 @@ void Player::threadFeedScan()
     threadCheckExit();
 
     // Calculate next jump delay
+#ifndef WIN32
     gettimeofday(&loopTimeN, NULL);
     realLoopTime = ((loopTimeN.tv_sec - loopTime.tv_sec) * 1000) + ((loopTimeN.tv_usec - loopTime.tv_usec) / 1000);
     loopTime.tv_sec = loopTimeN.tv_sec;
     loopTime.tv_usec = loopTimeN.tv_usec;
+#else
+    loopTimeN = timeGetTime();
+    realLoopTime = loopTimeN - loopTime;
+    loopTime = loopTimeN;
+#endif
 
     offset = 0;
     if (sleepTime) offset = realLoopTime - sleepTime;

diff --git a/player.h b/player.h
index 7253cf6123de26621095e0fd012a956a82ef8215..ab96c6ef9470e0cea9757af11fe428d973f5eb08 100644 (file)
--- a/player.h
+++ b/player.h
@@ -23,7 +23,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 #include <time.h>
 
 #include "audio.h"
@@ -192,3 +194,5 @@ Jump   -> Play
        -> FFwd
        -> FBwd
        -> Stop
+
+*/