a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up code/optmized sound code

Browse Source
This commit is contained in:
pagefault
2001-05-09 00:50:31 +00:00
parent 6690b47c8c
commit 3e30cd9830
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zsnes/src/win/winlink.cpp
View File

@@ -488,8 +488,7 @@ int RegisterWinClass(void)
InitSound() InitSound()
{ {
HRESULT hr; WAVEFORMATEX wfx;
WAVEFORMATEX wfx;
if (!SoundEnabled) return FALSE; if (!SoundEnabled) return FALSE;
@@ -498,8 +497,7 @@ InitSound()
if(DS_OK == DirectSoundCreate(NULL, &lpDirectSound,NULL)) if(DS_OK == DirectSoundCreate(NULL, &lpDirectSound,NULL))
{ {
hr = lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_NORMAL ); if (DS_OK != lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_NORMAL)) {SoundEnabled=0; return FALSE;}
if (hr != DS_OK) {SoundEnabled=0; return FALSE;}
} }
else else
{ {
@@ -507,6 +505,7 @@ InitSound()
} }
wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.wFormatTag = WAVE_FORMAT_PCM;
switch(SoundQuality) switch(SoundQuality)
{ {
case 0: case 0:
@@ -563,15 +562,13 @@ InitSound()
wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
wfx.cbSize=0; wfx.cbSize=0;
memset(&dsbd, 0, sizeof(DSBUFFERDESC)); memset(&dsbd, 0, sizeof(DSBUFFERDESC));
dsbd.dwSize = sizeof(DSBUFFERDESC); dsbd.dwSize = sizeof(DSBUFFERDESC);
dsbd.dwFlags = DSBCAPS_STICKYFOCUS; // | DSBCAPS_PRIMARYBUFFER; dsbd.dwFlags = DSBCAPS_STICKYFOCUS; // | DSBCAPS_PRIMARYBUFFER;
dsbd.dwBufferBytes = SoundBufferSize; dsbd.dwBufferBytes = SoundBufferSize;
dsbd.lpwfxFormat = &wfx; dsbd.lpwfxFormat = &wfx;
hr = lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL); if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL))
if(DS_OK == hr)
{ {
if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING )) if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING ))
{ {
@@ -589,8 +586,7 @@ InitSound()
ReInitSound() ReInitSound()
{ {
HRESULT hr; WAVEFORMATEX wfx;
WAVEFORMATEX wfx;
if (!SoundEnabled) return FALSE; if (!SoundEnabled) return FALSE;
@@ -600,8 +596,8 @@ ReInitSound()
PrevSoundQuality=SoundQuality; PrevSoundQuality=SoundQuality;
PrevStereoSound=StereoSound; PrevStereoSound=StereoSound;
wfx.wFormatTag = WAVE_FORMAT_PCM;
wfx.wFormatTag = WAVE_FORMAT_PCM;
switch(SoundQuality) switch(SoundQuality)
{ {
case 0: case 0:
@@ -659,9 +655,7 @@ ReInitSound()
dsbd.dwBufferBytes = SoundBufferSize; dsbd.dwBufferBytes = SoundBufferSize;
dsbd.lpwfxFormat = &wfx; dsbd.lpwfxFormat = &wfx;
hr = lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL); if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL))
if(DS_OK == hr)
{ {
if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING )) if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING ))
{ {