From 992e96ab7d00dbe163adcf0772e4a6fd63cf39e8 Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Sat, 4 Feb 2017 16:30:44 +0100
Subject: [PATCH] Remove dead code

---
 sound.cpp | 74 -------------------------------------------------------
 sound.h   |  1 -
 2 files changed, 75 deletions(-)

diff --git a/sound.cpp b/sound.cpp
index 66b02f7..586f98b 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -10,80 +10,6 @@
 #include "resource.h"
 
 
-struct WaveHeader
-{
-    BYTE        RIFF[4];          // "RIFF"
-    DWORD       dwSize;           // Size of data to follow
-    BYTE        WAVE[4];          // "WAVE"
-    BYTE        fmt_[4];          // "fmt "
-    DWORD       dw16;             // 16
-    WORD        wOne_0;           // 1
-    WORD        wChnls;           // Number of Channels
-    DWORD       dwSRate;          // Sample Rate
-    DWORD       BytesPerSec;      // Sample Rate
-    WORD        wBlkAlign;        // 1
-    WORD        BitsPerSample;    // Sample size
-    BYTE        DATA[4];          // "DATA"
-    DWORD       dwDSize;          // Number of Samples
-};
-
-// Reads in data from a wave file.
-
-bool CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, FILE* pFile, DWORD dwSize, DWORD dwPos) 
-{
-    // Seek to correct position in file (if necessary)
-    if ( dwPos != 0xffffffff ) 
-    {
-        if ( fseek(pFile, dwPos, SEEK_SET) != 0 ) 
-        {
-            return false;
-        }
-    }
-
-    // Lock data in buffer for writing
-    LPVOID	pData1;
-    DWORD	dwData1Size;
-    LPVOID	pData2;
-    DWORD	dwData2Size;
-    HRESULT	rval;
-
-    rval = lpDSB->Lock(0, dwSize, &pData1, &dwData1Size, &pData2, &dwData2Size, DSBLOCK_FROMWRITECURSOR);
-    if ( rval != DS_OK )
-    {
-        return false;
-    }
-
-    // Read in first chunk of data
-    if ( dwData1Size > 0 ) 
-    {
-        if ( fread(pData1, dwData1Size, 1, pFile) != 1 ) 
-        {          
-                        char holder[256];
-                        wsprintf(holder,"Data1 : %d, dwdata: %d, pFile: %d",pData1,dwData1Size,pFile);
-                        OutputDebug(holder);
-            return false;
-        }
-    }
-
-    // read in second chunk if necessary
-    if ( dwData2Size > 0 ) 
-    {
-        if ( fread(pData2, dwData2Size, 1, pFile) != 1 ) 
-        {
-            return false;
-        }
-    }
-
-    // Unlock data in buffer
-    rval = lpDSB->Unlock(pData1, dwData1Size, pData2, dwData2Size);
-    if ( rval != DS_OK )
-    {
-        return false;
-    }
-
-    return true;
-}
-
 // Stops all sounds.
 
 bool CSound::StopAllSounds()
diff --git a/sound.h b/sound.h
index b4716e1..ece5af8 100644
--- a/sound.h
+++ b/sound.h
@@ -44,7 +44,6 @@ public:
 	void	SetSuspendSkip(int nb);
 
 protected:
-	bool	ReadData(LPDIRECTSOUNDBUFFER lpDSB, FILE* pFile, DWORD dwSize, DWORD dwPos);
 	bool	StopAllSounds();
 
 protected: