From e11009c27164081a7a1dc91559853f95f05cb610 Mon Sep 17 00:00:00 2001
From: DJRobX <DJRobX@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Mon, 5 Nov 2007 20:03:11 +0000
Subject: [PATCH] Remove windows dependency, small timing fix

---
 src/snd_interp.cpp | 22 +++++++++-------------
 src/snd_interp.h   |  3 ---
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/snd_interp.cpp b/src/snd_interp.cpp
index a544bb8c..85e85f4c 100644
--- a/src/snd_interp.cpp
+++ b/src/snd_interp.cpp
@@ -1,10 +1,6 @@
 #include <math.h>
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #include "../libresample-0.1.3/include/libresample.h"
-
 #include "snd_interp.h"
 
 // this was once borrowed from libmodplug, and was also used to generate the FIR coefficient
@@ -265,8 +261,9 @@ public:
 
 		// wahoo, takes care of drifting
 		if (samples.size() > 2)
-			position+=1;
-		position += lrate;
+			position+=lrate+16383;
+		else
+			position+=lrate;
 
 		return ret;
 	}
@@ -334,10 +331,9 @@ public:
 
 		// wahoo, takes care of drifting
 		if (samples.size() > 8)
-		{
-			position+=1;
-		}
-		position += lrate;
+			position+=lrate+16383;
+		else
+			position+=lrate;
 
 		return ret;
 	}
@@ -401,9 +397,9 @@ public:
 
 		// wahoo, takes care of drifting
 		if (samples.size() > 16)
-			position+=1;
-
-		position+=lrate;
+			position+=lrate+16383;
+		else
+			position+=lrate;
 		return ret;
 	}
 };
diff --git a/src/snd_interp.h b/src/snd_interp.h
index 97a3377d..f9b22ba9 100644
--- a/src/snd_interp.h
+++ b/src/snd_interp.h
@@ -1,9 +1,6 @@
 #ifndef __SND_INTERP_H__
 #define __SND_INTERP_H__
 
-#include <stdio.h>
-#include <windows.h>
-
 class foo_interpolate
 {
 public: