From 168d08acc2b24662fdfe9b35daf49e1874a43bd9 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Fri, 20 Apr 2007 21:15:21 +0000
Subject: [PATCH] Fixed compiler warning and removed some dead code.

Originally committed to SVN as r1101.
---
 aegisub/audio_player_dsound.cpp | 13 -------------
 aegisub/audio_player_dsound.h   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/aegisub/audio_player_dsound.cpp b/aegisub/audio_player_dsound.cpp
index c960463ec..81a4616d1 100644
--- a/aegisub/audio_player_dsound.cpp
+++ b/aegisub/audio_player_dsound.cpp
@@ -314,19 +314,6 @@ __int64 DirectSoundPlayer::GetCurrentPosition() {
 	DWORD curtime = GetTickCount();
 	__int64 tdiff = curtime - startTime;
 	return startPos + tdiff * provider->GetSampleRate() / 1000;
-
-	// Read position
-	unsigned long int play,write;
-	HRESULT res = buffer->GetCurrentPosition(&play,NULL);
-	if (SUCCEEDED(res)) {
-		int bytesps = provider->GetBytesPerSample();
-		write = offset;
-		if (write < play) write += bufSize;
-		return playPos + play/bytesps - write/bytesps;
-	}
-
-	// Failed, just return playPos
-	return playPos;
 }
 
 
diff --git a/aegisub/audio_player_dsound.h b/aegisub/audio_player_dsound.h
index dc9198448..d1f3ee286 100644
--- a/aegisub/audio_player_dsound.h
+++ b/aegisub/audio_player_dsound.h
@@ -76,7 +76,7 @@ private:
 	volatile bool playing;
 	float volume;
 	int offset;
-	int bufSize;
+	DWORD bufSize;
 
 	volatile __int64 playPos;
 	__int64 startPos;