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

finish MusicManager (#453)

Browse Source 
* finish MusicManager

* Fixes/improvements

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-01-18 13:23:13 -05:00
committed by GitHub
parent 909c44b679
commit 30b35981d3
7 changed files with 168 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
View File

@@ -40,7 +40,7 @@ MxResult MxLoopingMIDIPresenter::PutData()
if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
SetVolume(((MxDSSound*) m_action)->GetVolume());
MusicManager()->FUN_100c09c0(m_chunk->GetData(), !m_action->GetLoopCount() ? -1 : m_action->GetLoopCount());
MusicManager()->InitializeMIDI(m_chunk->GetData(), !m_action->GetLoopCount() ? -1 : m_action->GetLoopCount());
}
m_criticalSection.Leave();

2
LEGO1/omni/src/audio/mxmidipresenter.cpp
View File

@@ -95,7 +95,7 @@ MxResult MxMIDIPresenter::PutData()
if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
SetVolume(((MxDSSound*) m_action)->GetVolume());
if (MusicManager()->FUN_100c09c0(m_chunk->GetData(), 1))
if (MusicManager()->InitializeMIDI(m_chunk->GetData(), 1))
EndAction();
}

142
LEGO1/omni/src/audio/mxmusicmanager.cpp
View File

@@ -31,11 +31,11 @@ void MxMusicManager::InitData()
{
m_midiStreamH = 0;
m_midiInitialized = FALSE;
m_unk0x38 = 0;
m_unk0x3c = 0;
m_unk0x40 = 0;
m_unk0x44 = 0;
m_unk0x48 = 0;
m_bufferSize = 0;
m_bufferCurrentSize = 0;
m_bufferOffset = 0;
m_bufferCurrentOffset = 0;
m_loopCount = 0;
m_midiHdrP = NULL;
}
@@ -62,6 +62,60 @@ void MxMusicManager::Destroy(MxBool p_fromDestructor)
}
}
// FUNCTION: LEGO1 0x100c0720
MxResult MxMusicManager::ResetStream()
{
MxResult result = FAILURE;
if (m_midiInitialized) {
if (m_bufferCurrentSize == 0) {
if (m_loopCount != -1) {
m_loopCount += -1;
if (!m_loopCount) {
DeinitializeMIDI();
goto done;
}
}
ResetBuffer();
}
if (m_midiHdrP->dwFlags & (MHDR_DONE | MHDR_PREPARED)) {
if (midiOutUnprepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR)) != MMSYSERR_NOERROR)
goto done;
memset(m_midiHdrP, 0, sizeof(MIDIHDR));
}
m_bufferCurrentOffset += 4;
DWORD length = *((DWORD*) m_bufferCurrentOffset);
m_bufferCurrentOffset += sizeof(DWORD);
m_midiHdrP->lpData = (LPSTR) m_bufferCurrentOffset;
m_midiHdrP->dwBufferLength = length;
m_midiHdrP->dwBytesRecorded = length;
if (!midiOutPrepareHeader((HMIDIOUT) m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR))) {
if (!midiStreamOut(m_midiStreamH, m_midiHdrP, sizeof(MIDIHDR))) {
result = SUCCESS;
m_bufferCurrentOffset += length;
m_bufferCurrentSize--;
}
}
}
done:
return result;
}
// FUNCTION: LEGO1 0x100c07e0
void MxMusicManager::ResetBuffer()
{
m_bufferCurrentOffset = m_bufferOffset;
m_bufferCurrentSize = m_bufferSize;
}
// FUNCTION: LEGO1 0x100c07f0
void MxMusicManager::SetMIDIVolume()
{
@@ -74,6 +128,19 @@ void MxMusicManager::SetMIDIVolume()
}
}
// FUNCTION: LEGO1 0x100c0820
void CALLBACK MxMusicManager::MidiCallbackProc(
HMIDIOUT p_hmo,
UINT p_wMsg,
DWORD_PTR p_dwInstance,
DWORD_PTR p_dwParam1,
DWORD_PTR p_dwParam2
)
{
if (p_wMsg == MOM_DONE)
((MxMusicManager*) p_dwInstance)->ResetStream();
}
// FUNCTION: LEGO1 0x100c0840
MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{
@@ -136,11 +203,68 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
return (result << 0x10) | result;
}
// STUB: LEGO1 0x100c09c0
undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount)
// FUNCTION: LEGO1 0x100c09c0
undefined4 MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
{
// TODO
return 0;
MxResult result = FAILURE;
m_criticalSection.Enter();
if (!m_midiInitialized) {
MxU32 total = midiOutGetNumDevs();
MxU32 device = 0;
for (; device < total; device++) {
MIDIOUTCAPSA caps;
midiOutGetDevCapsA(device, &caps, sizeof(MIDIOUTCAPSA));
if (caps.wTechnology == MOD_FMSYNTH)
break;
}
if (device >= total)
device = -1;
if (midiStreamOpen(&m_midiStreamH, &device, 1, (DWORD) MidiCallbackProc, (DWORD) this, CALLBACK_FUNCTION) !=
MMSYSERR_NOERROR)
goto done;
GetMIDIVolume(m_midiVolume);
m_midiHdrP = new MIDIHDR();
if (!m_midiHdrP)
goto done;
memset(m_midiHdrP, 0, sizeof(MIDIHDR));
MIDIPROPTIMEDIV timediv;
timediv.cbStruct = 8;
m_bufferOffset = p_data;
m_bufferOffset += 0x14;
timediv.dwTimeDiv = *((DWORD*) m_bufferOffset);
if (midiStreamProperty(m_midiStreamH, (LPBYTE) &timediv, MIDIPROP_SET | MIDIPROP_TIMEDIV) != MMSYSERR_NOERROR)
goto done;
m_bufferOffset += 0x14;
m_bufferSize = *((MxU32*) m_bufferOffset);
m_bufferOffset += sizeof(MxU32);
m_loopCount = p_loopCount;
m_midiInitialized = TRUE;
ResetBuffer();
if (ResetStream() != SUCCESS)
goto done;
SetMIDIVolume();
if (midiStreamRestart(m_midiStreamH) != MMSYSERR_NOERROR)
goto done;
result = SUCCESS;
}
done:
m_criticalSection.Leave();
return result;
}
// FUNCTION: LEGO1 0x100c0b20