mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-16 22:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed waveOut for multichannel audio (more than 2 channels)

Browse Source
This commit is contained in:
Daniel Önnerby 2008-10-06 21:07:18 +00:00
parent 889f4c856d
commit f25b682747
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/contrib/waveout/WaveOut.cpp
View File

@ -65,9 +65,8 @@ bool WaveOut::Open(void)
} }
m_Buffers = (WAVEHDR *)VirtualAlloc(NULL, m_NumBuffers * sizeof(WAVEHDR), MEM_COMMIT, PAGE_READWRITE); m_Buffers = (WAVEHDR *)VirtualAlloc(NULL, m_NumBuffers * sizeof(WAVEHDR), MEM_COMMIT, PAGE_READWRITE);
// m_dwBufferSize = m_BlockSize * m_NumBuffers;
unsigned int bytesPerSample = m_waveFormatPCMEx.Format.nChannels*m_waveFormatPCMEx.Format.wBitsPerSample/16; unsigned int bytesPerSample = m_waveFormatPCMEx.Format.wBitsPerSample/8;
m_dwBufferSize = m_BlockSize*bytesPerSample; m_dwBufferSize = m_BlockSize*bytesPerSample;
@ -76,9 +75,8 @@ bool WaveOut::Open(void)
for(unsigned long x=0; x<m_NumBuffers; x++) for(unsigned long x=0; x<m_NumBuffers; x++)
{ {
// m_Buffers[x].dwBufferLength = m_BlockSize * m_NumBuffers; m_Buffers[x].dwBufferLength = m_dwBufferSize;
m_Buffers[x].dwBufferLength = m_BlockSize*bytesPerSample; m_Buffers[x].lpData = (LPSTR)&(this->m_pfAudioBuffer[x*m_BlockSize]);
m_Buffers[x].lpData = (LPSTR)&m_pfAudioBuffer[x * m_BlockSize];
m_Buffers[x].dwUser = x; m_Buffers[x].dwUser = x;
m_Buffers[x].dwBytesRecorded = 0; m_Buffers[x].dwBytesRecorded = 0;
m_Buffers[x].dwFlags = 0; m_Buffers[x].dwFlags = 0;
@ -105,7 +103,7 @@ bool WaveOut::Close(void)
{ {
m_Playing = false; m_Playing = false;
again: do{
if(waveOutReset(m_waveHandle) == MMSYSERR_NOERROR) if(waveOutReset(m_waveHandle) == MMSYSERR_NOERROR)
{ {
for(unsigned long x=0; x<m_NumBuffers; x++) for(unsigned long x=0; x<m_NumBuffers; x++)
@ -114,11 +112,8 @@ again:
waveOutUnprepareHeader(m_waveHandle, &m_Buffers[x], sizeof(WAVEHDR)); waveOutUnprepareHeader(m_waveHandle, &m_Buffers[x], sizeof(WAVEHDR));
} }
} }
} while((r = waveOutClose(m_waveHandle)) != MMSYSERR_NOERROR);
while((r = waveOutClose(m_waveHandle)) != MMSYSERR_NOERROR)
{
goto again;
}
m_waveHandle = NULL; m_waveHandle = NULL;