actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup; check primary buffer format

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-14 19:53:15 +00:00
parent 70a2d889a4
commit 46d0b2e2f6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/DSoundHelpers.cpp
+14 -6
View File
@@ -57,19 +57,27 @@ void DSound::SetPrimaryBufferMode()
} }
WAVEFORMATEX waveformat; WAVEFORMATEX waveformat;
memset( &waveformat, 0, sizeof(waveformat) );
waveformat.cbSize = 0; waveformat.cbSize = 0;
waveformat.wFormatTag = WAVE_FORMAT_PCM; waveformat.wFormatTag = WAVE_FORMAT_PCM;
waveformat.wBitsPerSample = WORD(16); waveformat.wBitsPerSample = 16;
waveformat.nChannels = WORD(2); waveformat.nChannels = 2;
waveformat.nSamplesPerSec = DWORD(44100); waveformat.nSamplesPerSec = 44100;
waveformat.nBlockAlign = WORD(4); waveformat.nBlockAlign = 4;
waveformat.nAvgBytesPerSec = 44100 * waveformat.nBlockAlign; waveformat.nAvgBytesPerSec = waveformat.nSamplesPerSec * waveformat.nBlockAlign;
// Set the primary buffer's format // Set the primary buffer's format
hr = IDirectSoundBuffer_SetFormat( buf, &waveformat ); hr = IDirectSoundBuffer_SetFormat( buf, &waveformat );
if( FAILED(hr) ) if( FAILED(hr) )
LOG->Warn( hr_ssprintf(hr, "SetFormat on primary buffer") ); LOG->Warn( hr_ssprintf(hr, "SetFormat on primary buffer") );
DWORD got;
hr = buf->GetFormat( &waveformat, sizeof(waveformat), &got );
if( FAILED(hr) )
LOG->Warn( hr_ssprintf(hr, "GetFormat on primary buffer") );
else if( waveformat.nSamplesPerSec != 44100 )
LOG->Warn( hr_ssprintf(hr, "Primary buffer set to %i instead of 44100", waveformat.nSamplesPerSec) );
/* MS docs: /* MS docs:
* *
* When there are no sounds playing, DirectSound stops the mixer engine and halts DMA * When there are no sounds playing, DirectSound stops the mixer engine and halts DMA
@@ -181,7 +189,7 @@ DSoundBuf::DSoundBuf( DSound &ds, DSoundBuf::hw hardware,
WAVEFORMATEX waveformat; WAVEFORMATEX waveformat;
memset( &waveformat, 0, sizeof(waveformat) ); memset( &waveformat, 0, sizeof(waveformat) );
waveformat.cbSize = sizeof(waveformat); waveformat.cbSize = 0;
waveformat.wFormatTag = WAVE_FORMAT_PCM; waveformat.wFormatTag = WAVE_FORMAT_PCM;
bool NeedCtrlFrequency = false; bool NeedCtrlFrequency = false;