isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-27 18:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name more variables

Browse Source
This commit is contained in:
Christian Semmler 2023-11-23 12:36:42 -05:00
parent 3eeb940b24
commit 06c77cc221
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
LEGO1/mxwavepresenter.cpp
View File

@ -34,9 +34,9 @@ void MxWavePresenter::Init()
{ {
m_waveFormat = NULL; m_waveFormat = NULL;
m_dsBuffer = NULL; m_dsBuffer = NULL;
m_length = 0; m_chunkLength = 0;
m_lockSize = 0; m_lockSize = 0;
m_unk64 = 0; m_writtenChunks = 0;
m_playing = FALSE; m_playing = FALSE;
m_unk66 = FALSE; m_unk66 = FALSE;
m_unk68 = FALSE; m_unk68 = FALSE;
@ -68,21 +68,21 @@ void MxWavePresenter::Destroy(MxBool p_fromDestructor)
} }
// OFFSET: LEGO1 0x100b1b60 // OFFSET: LEGO1 0x100b1b60
MxS8 MxWavePresenter::FUN_100b1b60() MxS8 MxWavePresenter::GetPlayedChunks()
{ {
DWORD dwCurrentPlayCursor, dwCurrentWriteCursor; DWORD dwCurrentPlayCursor, dwCurrentWriteCursor;
MxS8 result = -1; MxS8 playedChunks = -1;
if (m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor) == DS_OK) if (m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor) == DS_OK)
result = dwCurrentPlayCursor / m_length; playedChunks = dwCurrentPlayCursor / m_chunkLength;
return result; return playedChunks;
} }
// OFFSET: LEGO1 0x100b1ba0 // OFFSET: LEGO1 0x100b1ba0
MxBool MxWavePresenter::FUN_100b1ba0() MxBool MxWavePresenter::FUN_100b1ba0()
{ {
return !m_playing || FUN_100b1b60() != m_unk64; return !m_playing || GetPlayedChunks() != m_writtenChunks;
} }
// OFFSET: LEGO1 0x100b1bd0 // OFFSET: LEGO1 0x100b1bd0
@ -95,7 +95,7 @@ void MxWavePresenter::WriteToSoundBuffer(void* p_audioPtr, MxU32 p_length)
DWORD dwAudioBytes1; DWORD dwAudioBytes1;
DWORD dwAudioBytes2; DWORD dwAudioBytes2;
dwOffset = m_length * m_unk64; dwOffset = m_chunkLength * m_writtenChunks;
m_dsBuffer->GetStatus(&dwStatus); m_dsBuffer->GetStatus(&dwStatus);
if (dwStatus == DSBSTATUS_BUFFERLOST) { if (dwStatus == DSBSTATUS_BUFFERLOST) {
@ -105,12 +105,12 @@ void MxWavePresenter::WriteToSoundBuffer(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_writtenChunks++;
m_lockSize = p_length; m_lockSize = p_length;
} }
else { else {
m_unk64 = 1 - m_unk64; m_writtenChunks = 1 - m_writtenChunks;
m_lockSize = m_length; m_lockSize = m_chunkLength;
} }
if (m_dsBuffer->Lock(dwOffset, m_lockSize, &pvAudioPtr1, &dwAudioBytes1, &pvAudioPtr2, &dwAudioBytes2, 0) == if (m_dsBuffer->Lock(dwOffset, m_lockSize, &pvAudioPtr1, &dwAudioBytes1, &pvAudioPtr2, &dwAudioBytes2, 0) ==
@ -150,7 +150,7 @@ void MxWavePresenter::StartingTickle()
MxU32 length = chunk->GetLength(); MxU32 length = chunk->GetLength();
WAVEFORMATEX waveFormatEx; WAVEFORMATEX waveFormatEx;
m_length = length; m_chunkLength = length;
memset(&waveFormatEx, 0, sizeof(waveFormatEx)); memset(&waveFormatEx, 0, sizeof(waveFormatEx));
waveFormatEx.wFormatTag = m_waveFormat->m_waveFormatEx.wFormatTag; waveFormatEx.wFormatTag = m_waveFormat->m_waveFormatEx.wFormatTag;
@ -205,11 +205,11 @@ void MxWavePresenter::StreamingTickle()
chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16); chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16);
m_currentChunk = new MxStreamChunk; m_currentChunk = new MxStreamChunk;
MxU8* data = new MxU8[m_length]; MxU8* data = new MxU8[m_chunkLength];
memset(data, m_silenceData, m_length); memset(data, m_silenceData, m_chunkLength);
m_currentChunk->SetLength(m_length); m_currentChunk->SetLength(m_chunkLength);
m_currentChunk->SetData(data); m_currentChunk->SetData(data);
m_currentChunk->SetTime(chunk->GetTime() + 1000); m_currentChunk->SetTime(chunk->GetTime() + 1000);
m_currentChunk->SetFlags(MxDSChunk::Flag_Bit1); m_currentChunk->SetFlags(MxDSChunk::Flag_Bit1);
@ -227,9 +227,9 @@ void MxWavePresenter::DoneTickle()
DWORD dwCurrentPlayCursor, dwCurrentWriteCursor; DWORD dwCurrentPlayCursor, dwCurrentWriteCursor;
m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor); m_dsBuffer->GetCurrentPosition(&dwCurrentPlayCursor, &dwCurrentWriteCursor);
MxS8 result = dwCurrentPlayCursor / m_length; MxS8 playedChunks = dwCurrentPlayCursor / m_chunkLength;
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_lockSize + (m_length * result) <= dwCurrentPlayCursor) m_writtenChunks != playedChunks || m_lockSize + (m_chunkLength * playedChunks) <= dwCurrentPlayCursor)
MxMediaPresenter::DoneTickle(); MxMediaPresenter::DoneTickle();
} }
else else
@ -313,7 +313,7 @@ void MxWavePresenter::Enable(MxBool p_enable)
MxSoundPresenter::Enable(p_enable); MxSoundPresenter::Enable(p_enable);
if (p_enable) { if (p_enable) {
m_unk64 = 0; m_writtenChunks = 0;
m_playing = FALSE; m_playing = FALSE;
} }
else if (m_dsBuffer) else if (m_dsBuffer)

6
LEGO1/mxwavepresenter.h
View File

@ -53,15 +53,15 @@ class MxWavePresenter : public MxSoundPresenter {
private: private:
void Init(); void Init();
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
MxS8 FUN_100b1b60(); MxS8 GetPlayedChunks();
MxBool FUN_100b1ba0(); MxBool FUN_100b1ba0();
void WriteToSoundBuffer(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_chunkLength; // 0x5c
MxU32 m_lockSize; // 0x60 MxU32 m_lockSize; // 0x60
MxU8 m_unk64; // 0x64 MxU8 m_writtenChunks; // 0x64
MxBool m_playing; // 0x65 MxBool m_playing; // 0x65
MxBool m_unk66; // 0x66 MxBool m_unk66; // 0x66
MxS8 m_silenceData; // 0x67 MxS8 m_silenceData; // 0x67