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

Updated windows sound code; fixed bug when sound was disabled and continued to play

Browse Source
This commit is contained in:
pagefault
2003-04-12 16:59:24 +00:00
parent 98d4616568
commit 54ff8c44b6
1 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,6 +329,7 @@ extern "C" {
void initwinvideo(); void initwinvideo();
void DosExit(void); void DosExit(void);
extern BYTE GUIOn2; extern BYTE GUIOn2;
extern BYTE cfgsoundon;
extern BYTE StereoSound; extern BYTE StereoSound;
extern DWORD SoundQuality; extern DWORD SoundQuality;
extern BYTE HighPriority; extern BYTE HighPriority;
@@ -644,28 +645,28 @@ InitSound()
{ {
WAVEFORMATEX wfx; WAVEFORMATEX wfx;
if (!SoundEnabled) return FALSE; if (cfgsoundon == 0) return FALSE;
SoundEnabled = 0;
PrevSoundQuality=SoundQuality; PrevSoundQuality=SoundQuality;
PrevStereoSound=StereoSound; PrevStereoSound=StereoSound;
if (DS_OK == pDirectSoundCreate8(NULL, &lpDirectSound,NULL)) if (DS_OK == pDirectSoundCreate8(NULL, &lpDirectSound,NULL))
{ {
if (DS_OK != lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_NORMAL)) lpDirectSound->Initialize(NULL);
{ if (DS_OK != lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_NORMAL))
if (DS_OK != lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_EXCLUSIVE)) {
{ if (DS_OK != lpDirectSound->SetCooperativeLevel(hMainWindow, DSSCL_EXCLUSIVE))
SoundEnabled=0; return FALSE;
return FALSE; }
} }
} else
} {
else return FALSE;
{ }
SoundEnabled=0; return FALSE;
}
wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.wFormatTag = WAVE_FORMAT_PCM;
switch (SoundQuality) switch (SoundQuality)
{ {
@@ -730,19 +731,20 @@ InitSound()
{ {
if (DS_OK != lpSoundBuffer->Play(0,0,DSBPLAY_LOOPING)) if (DS_OK != lpSoundBuffer->Play(0,0,DSBPLAY_LOOPING))
{ {
SoundEnabled=0; return FALSE; return FALSE;
} }
SoundEnabled=1;
FirstSound=0; FirstSound=0;
return TRUE; return TRUE;
} }
else else
{ {
SoundEnabled=0; return FALSE; return FALSE;
} }
} }
else else
{ {
SoundEnabled=0; return FALSE; return FALSE;
} }
} }
@@ -751,8 +753,23 @@ ReInitSound()
{ {
WAVEFORMATEX wfx; WAVEFORMATEX wfx;
lpSoundBuffer->Stop(); if (lpSoundBuffer)
lpSoundBuffer->Release(); {
lpSoundBuffer->Stop();
lpSoundBuffer->Release();
lpSoundBuffer = NULL;
}
if (cfgsoundon == 0)
{
SoundEnabled = 0;
ReleaseDirectSound();
return FALSE;
}
else if (SoundEnabled == 0)
return InitSound();
SoundEnabled = 0;
PrevSoundQuality=SoundQuality; PrevSoundQuality=SoundQuality;
PrevStereoSound=StereoSound; PrevStereoSound=StereoSound;
@@ -824,6 +841,7 @@ ReInitSound()
{ {
return FALSE; return FALSE;
} }
SoundEnabled=1;
LastUsedPos=0; LastUsedPos=0;
return TRUE; return TRUE;
} }