isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match WriteToSoundBuffer

Browse Source
This commit is contained in:
Christian Semmler 2023-11-23 11:54:26 -05:00
parent 10dc05eead
commit 85ed487253
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
LEGO1/mxwavepresenter.cpp
View File

@ -37,7 +37,7 @@ void MxWavePresenter::Init()
m_waveFormat = NULL; m_waveFormat = NULL;
m_dsBuffer = NULL; m_dsBuffer = NULL;
m_length = 0; m_length = 0;
m_bytes = 0; m_lockSize = 0;
m_unk64 = 0; m_unk64 = 0;
m_playing = FALSE; m_playing = FALSE;
m_unk66 = FALSE; m_unk66 = FALSE;
@ -88,7 +88,7 @@ MxBool MxWavePresenter::FUN_100b1ba0()
} }
// OFFSET: LEGO1 0x100b1bd0 // OFFSET: LEGO1 0x100b1bd0
void MxWavePresenter::FUN_100b1bd0(void* p_audioPtr, MxU32 p_length) void MxWavePresenter::WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length)
{ {
DWORD dwStatus; DWORD dwStatus;
LPVOID pvAudioPtr1; LPVOID pvAudioPtr1;
@ -108,23 +108,22 @@ void MxWavePresenter::FUN_100b1bd0(void* p_audioPtr, MxU32 p_length)
if (dwStatus != DSBSTATUS_BUFFERLOST) { if (dwStatus != DSBSTATUS_BUFFERLOST) {
if (m_action->GetFlags() & MxDSAction::Flag_Looping) { if (m_action->GetFlags() & MxDSAction::Flag_Looping) {
m_unk64++; m_unk64++;
m_bytes = p_length; m_lockSize = p_length;
} }
else { else {
m_unk64 = 1 - m_unk64; m_unk64 = 1 - m_unk64;
m_bytes = m_length; m_lockSize = m_length;
} }
if (m_dsBuffer->Lock(dwOffset, m_bytes, &pvAudioPtr1, &dwAudioBytes1, &pvAudioPtr2, &dwAudioBytes2, 0) == if (m_dsBuffer->Lock(dwOffset, m_lockSize, &pvAudioPtr1, &dwAudioBytes1, &pvAudioPtr2, &dwAudioBytes2, 0) ==
DS_OK) { DS_OK) {
memcpy(pvAudioPtr1, p_audioPtr, p_length); memcpy(pvAudioPtr1, p_audioPtr, p_length);
// TODO if (m_lockSize > p_length && !(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
memset((MxU8*) pvAudioPtr1 + p_length, m_silenceData, m_lockSize - p_length);
if (m_bytes > p_length && !(m_action->GetFlags() & MxDSAction::Flag_Looping)) {
} }
m_dsBuffer->Unlock(pvAudioPtr1, m_bytes, pvAudioPtr2, 0); m_dsBuffer->Unlock(pvAudioPtr1, m_lockSize, pvAudioPtr2, 0);
} }
} }
} }
@ -164,10 +163,10 @@ void MxWavePresenter::StartingTickle()
waveFormatEx.wBitsPerSample = m_waveFormat->m_waveFormatEx.wBitsPerSample; waveFormatEx.wBitsPerSample = m_waveFormat->m_waveFormatEx.wBitsPerSample;
if (waveFormatEx.wBitsPerSample == 8) if (waveFormatEx.wBitsPerSample == 8)
m_unk67 = SCHAR_MAX; m_silenceData = 0x7F;
if (waveFormatEx.wBitsPerSample == 16) if (waveFormatEx.wBitsPerSample == 16)
m_unk67 = 0; m_silenceData = 0;
DSBUFFERDESC desc; DSBUFFERDESC desc;
memset(&desc, 0, sizeof(desc)); memset(&desc, 0, sizeof(desc));
@ -232,7 +231,7 @@ void MxWavePresenter::DoneTickle()
MxS8 result = dwCurrentPlayCursor / m_length; MxS8 result = dwCurrentPlayCursor / m_length;
if (m_action->GetFlags() & MxDSAction::Flag_Bit7 || m_action->GetFlags() & MxDSAction::Flag_Looping || if (m_action->GetFlags() & MxDSAction::Flag_Bit7 || m_action->GetFlags() & MxDSAction::Flag_Looping ||
m_unk64 != result || m_bytes + (m_length * result) <= dwCurrentPlayCursor) m_unk64 != result || m_lockSize + (m_length * result) <= dwCurrentPlayCursor)
MxMediaPresenter::DoneTickle(); MxMediaPresenter::DoneTickle();
} }
else else
@ -242,7 +241,7 @@ void MxWavePresenter::DoneTickle()
// OFFSET: LEGO1 0x100b2130 // OFFSET: LEGO1 0x100b2130
void MxWavePresenter::AppendChunk(MxStreamChunk* p_chunk) void MxWavePresenter::AppendChunk(MxStreamChunk* p_chunk)
{ {
FUN_100b1bd0(p_chunk->GetData(), p_chunk->GetLength()); WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength());
if (IsEnabled()) if (IsEnabled())
m_subscriber->FUN_100b8390(p_chunk); m_subscriber->FUN_100b8390(p_chunk);
} }
@ -256,7 +255,7 @@ undefined4 MxWavePresenter::PutData()
switch (m_currentTickleState) { switch (m_currentTickleState) {
case TickleState_Streaming: case TickleState_Streaming:
if (m_currentChunk && FUN_100b1ba0()) { if (m_currentChunk && FUN_100b1ba0()) {
FUN_100b1bd0(m_currentChunk->GetData(), m_currentChunk->GetLength()); WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength());
m_subscriber->FUN_100b8390(m_currentChunk); m_subscriber->FUN_100b8390(m_currentChunk);
m_currentChunk = NULL; m_currentChunk = NULL;
} }

6
LEGO1/mxwavepresenter.h
View File

@ -55,16 +55,16 @@ class MxWavePresenter : public MxSoundPresenter {
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
MxS8 FUN_100b1b60(); MxS8 FUN_100b1b60();
MxBool FUN_100b1ba0(); MxBool FUN_100b1ba0();
void FUN_100b1bd0(void* p_audioPtr, MxU32 p_length); void WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length);
WaveFormat* m_waveFormat; // 0x54 WaveFormat* m_waveFormat; // 0x54
LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x58 LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x58
MxU32 m_length; // 0x5c MxU32 m_length; // 0x5c
MxU32 m_bytes; // 0x60 MxU32 m_lockSize; // 0x60
MxU8 m_unk64; // 0x64 MxU8 m_unk64; // 0x64
MxBool m_playing; // 0x65 MxBool m_playing; // 0x65
MxBool m_unk66; // 0x66 MxBool m_unk66; // 0x66
MxS8 m_unk67; // 0x67 MxS8 m_silenceData; // 0x67
MxBool m_unk68; // 0x68 MxBool m_unk68; // 0x68
}; };