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

Implemented primary sound buffer

Browse Source
This commit is contained in:
pagefault
2001-05-17 21:52:58 +00:00
parent 0f18bb7be4
commit 8053ed202e
1 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ HINSTANCE hInst;
} }
LPDIRECTSOUND8 lpDirectSound; LPDIRECTSOUND8 lpDirectSound;
LPDIRECTSOUNDBUFFER SoundBuffer; LPDIRECTSOUNDBUFFER8 lpSoundBuffer;
LPDIRECTSOUNDBUFFER lpPrimaryBuffer; LPDIRECTSOUNDBUFFER lpPrimaryBuffer;
DSBUFFERDESC dsbd; DSBUFFERDESC dsbd;
@@ -554,19 +554,26 @@ InitSound()
dsbd.dwBufferBytes = SoundBufferSize; dsbd.dwBufferBytes = SoundBufferSize;
dsbd.lpwfxFormat = &wfx; dsbd.lpwfxFormat = &wfx;
if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL)) if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &lpPrimaryBuffer, NULL))
{ {
if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING )) if(DS_OK == lpPrimaryBuffer->QueryInterface(IID_IDirectSoundBuffer8, (LPVOID *) &lpSoundBuffer))
{
if(DS_OK != lpSoundBuffer->Play(0,0,DSBPLAY_LOOPING))
{
SoundEnabled=0; return FALSE;
}
FirstSound=0;
return TRUE;
}
else
{ {
SoundEnabled=0; return FALSE; SoundEnabled=0; return FALSE;
} }
FirstSound=0;
return TRUE;
} }
else else
{ {
SoundEnabled=0; return FALSE; SoundEnabled=0; return FALSE;
} }
} }
@@ -576,8 +583,8 @@ ReInitSound()
if (!SoundEnabled) return FALSE; if (!SoundEnabled) return FALSE;
SoundBuffer->Stop(); lpSoundBuffer->Stop();
SoundBuffer->Release(); lpSoundBuffer->Release();
PrevSoundQuality=SoundQuality; PrevSoundQuality=SoundQuality;
PrevStereoSound=StereoSound; PrevStereoSound=StereoSound;
@@ -641,19 +648,26 @@ ReInitSound()
dsbd.dwBufferBytes = SoundBufferSize; dsbd.dwBufferBytes = SoundBufferSize;
dsbd.lpwfxFormat = &wfx; dsbd.lpwfxFormat = &wfx;
if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &SoundBuffer, NULL)) if(DS_OK == lpDirectSound->CreateSoundBuffer(&dsbd, &lpPrimaryBuffer, NULL))
{ {
if(DS_OK != SoundBuffer->Play(0,0,DSBPLAY_LOOPING )) if(DS_OK == lpPrimaryBuffer->QueryInterface(IID_IDirectSoundBuffer8, (LPVOID *) &lpSoundBuffer))
{
if(DS_OK != lpSoundBuffer->Play(0,0,DSBPLAY_LOOPING ))
{
return FALSE;
}
LastUsedPos=0;
return TRUE;
}
else
{ {
return FALSE; return FALSE;
} }
LastUsedPos=0;
return TRUE;
} }
else else
{ {
return FALSE; return FALSE;
} }
} }
@@ -814,10 +828,10 @@ void endgame()
lpDirectSound=NULL; lpDirectSound=NULL;
} }
if(SoundBuffer) if(lpSoundBuffer)
{ {
SoundBuffer->Release(); lpSoundBuffer->Release();
SoundBuffer=NULL; lpSoundBuffer=NULL;
} }
if(lpPrimaryBuffer) if(lpPrimaryBuffer)
@@ -1538,7 +1552,7 @@ void UpdateVFrame(void)
if (!SoundEnabled) return; if (!SoundEnabled) return;
SoundBuffer->GetCurrentPosition(&CurrentPos,&WritePos); lpSoundBuffer->GetCurrentPosition(&CurrentPos,&WritePos);
if(LastUsedPos <= CurrentPos) if(LastUsedPos <= CurrentPos)
{ {
@@ -1546,7 +1560,7 @@ void UpdateVFrame(void)
} }
else else
{ {
DataNeeded=SoundBufferSize- LastUsedPos + CurrentPos; DataNeeded=SoundBufferSize - LastUsedPos + CurrentPos;
} }
DataNeeded/=(SPCSize*2); DataNeeded/=(SPCSize*2);
@@ -1571,7 +1585,7 @@ void UpdateVFrame(void)
if(T36HZEnabled)Buffer[i]=0; if(T36HZEnabled)Buffer[i]=0;
} }
if(DS_OK!=SoundBuffer->Lock(LastUsedPos, if(DS_OK!=lpSoundBuffer->Lock(LastUsedPos,
SPCSize*2, &lpvPtr1, SPCSize*2, &lpvPtr1,
&dwBytes1, &lpvPtr2, &dwBytes1, &lpvPtr2,
&dwBytes2, 0)) &dwBytes2, 0))
@@ -1588,7 +1602,7 @@ void UpdateVFrame(void)
CopyMemory(lpvPtr2, &Buffer[0]+dwBytes1, dwBytes2); CopyMemory(lpvPtr2, &Buffer[0]+dwBytes1, dwBytes2);
} }
if(DS_OK != SoundBuffer->Unlock(lpvPtr1, dwBytes1, lpvPtr2, dwBytes2)) if(DS_OK != lpSoundBuffer->Unlock(lpvPtr1, dwBytes1, lpvPtr2, dwBytes2))
{ {
return; return;
} }