From d0abde9274892c9e80df1af4de138b873b3df887 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 4 Feb 2017 16:25:10 +0100 Subject: [PATCH] Remove unused functions --- sound.cpp | 57 ------------------------------------------------------- sound.h | 2 -- 2 files changed, 59 deletions(-) diff --git a/sound.cpp b/sound.cpp index 98e584d..97df755 100644 --- a/sound.cpp +++ b/sound.cpp @@ -35,36 +35,6 @@ struct WaveHeader DWORD dwDSize; // Number of Samples }; - - - -// Creates a DirectSound buffer. - -bool CSound::CreateSoundBuffer(int dwBuf, DWORD dwBufSize, DWORD dwFreq, DWORD dwBitsPerSample, DWORD dwBlkAlign, bool bStereo) -{ - PCMWAVEFORMAT pcmwf; - DSBUFFERDESC dsbdesc; - - // Set up wave format structure. - memset( &pcmwf, 0, sizeof(PCMWAVEFORMAT) ); - pcmwf.wf.wFormatTag = WAVE_FORMAT_PCM; - pcmwf.wf.nChannels = bStereo ? 2 : 1; - pcmwf.wf.nSamplesPerSec = dwFreq; - pcmwf.wf.nBlockAlign = (WORD)dwBlkAlign; - pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * pcmwf.wf.nBlockAlign; - pcmwf.wBitsPerSample = (WORD)dwBitsPerSample; - - // Set up DSBUFFERDESC structure. - memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); // Zero it out. - dsbdesc.dwSize = sizeof(DSBUFFERDESC); - dsbdesc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME; - dsbdesc.dwBufferBytes = dwBufSize; - dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf; - - TRY_DS(m_lpDS->CreateSoundBuffer(&dsbdesc, &m_lpDSB[dwBuf], NULL)) - return true; -} - // Reads in data from a wave file. bool CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, FILE* pFile, DWORD dwSize, DWORD dwPos) @@ -144,33 +114,6 @@ bool CSound::StopAllSounds() return true; } -// Plays a sound using direct sound. - -bool CSound::PlaySoundDS(DWORD dwSound, DWORD dwFlags) -{ - // Make sure the sound is valid - if ( dwSound >= MAXSOUND ) return false; - - // Make sure we have a valid sound buffer - if ( m_lpDSB[dwSound] ) - { - DWORD dwStatus; - TRY_DS(m_lpDSB[dwSound]->GetStatus(&dwStatus)); - - if ( (dwStatus & DSBSTATUS_PLAYING) != DSBSTATUS_PLAYING ) - { - // Play the sound - TRY_DS(m_lpDSB[dwSound]->Play(0, 0, dwFlags)); - } - } - - Mix_PlayChannel (-1, m_lpSDL[dwSound], 0); - - return true; -} - - - ///////////////////////////////////////////////////////////////////////////// diff --git a/sound.h b/sound.h index 3815879..b4716e1 100644 --- a/sound.h +++ b/sound.h @@ -44,10 +44,8 @@ public: void SetSuspendSkip(int nb); protected: - bool CreateSoundBuffer(int dwBuf, DWORD dwBufSize, DWORD dwFreq, DWORD dwBitsPerSample, DWORD dwBlkAlign, bool bStereo); bool ReadData(LPDIRECTSOUNDBUFFER lpDSB, FILE* pFile, DWORD dwSize, DWORD dwPos); bool StopAllSounds(); - bool PlaySoundDS(DWORD dwSound, DWORD dwFlags); protected: HWND m_hWnd;