mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement LegoLoadCacheSoundPresenter (#475)

Browse Source 
* fix

* fixes

* Fix WaveFormat, match LegoLoadCacheSoundPresenter

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Misha
2024-01-21 10:30:19 -05:00
committed by GitHub
parent 3f35302e76
commit 8e1197d14c
6 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/omni/include/mxwavepresenter.h
View File

@@ -49,12 +49,11 @@ public:
// FUNCTION: LEGO1 0x1000d6b0
virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
// Reference: https://github.com/itsmattkc/SIEdit/blob/master/lib/othertypes.h
// SIZE 0x1c
// SIZE 0x18
struct WaveFormat {
WAVEFORMATEX m_waveFormatEx;
MxU32 m_dataSize;
MxU32 m_flags;
PCMWAVEFORMAT m_pcmWaveFormat; // 0x00
MxU32 m_dataSize; // 0x10
MxU32 m_flags; // 0x14
};
// SYNTHETIC: LEGO1 0x1000d810

16
LEGO1/omni/src/audio/mxwavepresenter.cpp
View File

@@ -9,7 +9,7 @@
#include "mxutil.h"
DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c);
DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x1c);
DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x18);
// FUNCTION: LEGO1 0x100b1ad0
void MxWavePresenter::Init()
@@ -134,12 +134,12 @@ void MxWavePresenter::StartingTickle()
m_chunkLength = length;
memset(&waveFormatEx, 0, sizeof(waveFormatEx));
waveFormatEx.wFormatTag = m_waveFormat->m_waveFormatEx.wFormatTag;
waveFormatEx.nChannels = m_waveFormat->m_waveFormatEx.nChannels;
waveFormatEx.nSamplesPerSec = m_waveFormat->m_waveFormatEx.nSamplesPerSec;
waveFormatEx.nAvgBytesPerSec = m_waveFormat->m_waveFormatEx.nAvgBytesPerSec;
waveFormatEx.nBlockAlign = m_waveFormat->m_waveFormatEx.nBlockAlign;
waveFormatEx.wBitsPerSample = m_waveFormat->m_waveFormatEx.wBitsPerSample;
waveFormatEx.wFormatTag = m_waveFormat->m_pcmWaveFormat.wf.wFormatTag;
waveFormatEx.nChannels = m_waveFormat->m_pcmWaveFormat.wf.nChannels;
waveFormatEx.nSamplesPerSec = m_waveFormat->m_pcmWaveFormat.wf.nSamplesPerSec;
waveFormatEx.nAvgBytesPerSec = m_waveFormat->m_pcmWaveFormat.wf.nAvgBytesPerSec;
waveFormatEx.nBlockAlign = m_waveFormat->m_pcmWaveFormat.wf.nBlockAlign;
waveFormatEx.wBitsPerSample = m_waveFormat->m_pcmWaveFormat.wBitsPerSample;
if (waveFormatEx.wBitsPerSample == 8)
m_silenceData = 0x7F;
@@ -157,7 +157,7 @@ void MxWavePresenter::StartingTickle()
desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME;
if (m_action->GetFlags() & MxDSAction::c_looping)
desc.dwBufferBytes = m_waveFormat->m_waveFormatEx.nAvgBytesPerSec *
desc.dwBufferBytes = m_waveFormat->m_pcmWaveFormat.wf.nAvgBytesPerSec *
(m_action->GetDuration() / m_action->GetLoopCount()) / 1000;
else
desc.dwBufferBytes = 2 * length;