TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-27 14:42:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match MxMidiPresenter (#301)

Browse Source
This commit is contained in:
Christian Semmler 2023-11-24 12:21:26 -05:00 committed by GitHub
parent db77350169
commit 7db2b2e6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
LEGO1/mxmidipresenter.cpp
View File

@ -2,17 +2,12 @@
#include "decomp.h" #include "decomp.h"
#include "legoomni.h" #include "legoomni.h"
#include "mxautolocker.h"
#include "mxdssound.h"
#include "mxmusicmanager.h" #include "mxmusicmanager.h"
DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58); DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58);
// OFFSET: LEGO1 0x100c25a0 STUB
MxResult MxMIDIPresenter::AddToManager()
{
// TODO
return SUCCESS;
}
// OFFSET: LEGO1 0x100c25e0 // OFFSET: LEGO1 0x100c25e0
MxMIDIPresenter::MxMIDIPresenter() MxMIDIPresenter::MxMIDIPresenter()
{ {
@ -28,31 +23,61 @@ MxMIDIPresenter::~MxMIDIPresenter()
// OFFSET: LEGO1 0x100c2820 // OFFSET: LEGO1 0x100c2820
void MxMIDIPresenter::Init() void MxMIDIPresenter::Init()
{ {
m_unk54 = 0; m_chunk = NULL;
} }
// OFFSET: LEGO1 0x100c2830 STUB // OFFSET: LEGO1 0x100c2830
void MxMIDIPresenter::Destroy(MxBool p_fromDestructor) void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
{ {
// TODO if (MusicManager()) {
MusicManager()->DeinitializeMIDI();
}
m_criticalSection.Enter();
if (m_subscriber && m_chunk)
m_subscriber->FUN_100b8390(m_chunk);
Init();
m_criticalSection.Leave();
if (!p_fromDestructor)
MxMusicPresenter::Destroy();
} }
// OFFSET: LEGO1 0x100c2890 STUB // OFFSET: LEGO1 0x100c2890
void MxMIDIPresenter::ReadyTickle() void MxMIDIPresenter::ReadyTickle()
{ {
// TODO MxStreamChunk* chunk = NextChunk();
if (chunk) {
m_subscriber->FUN_100b8390(chunk);
ParseExtra();
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Starting;
}
} }
// OFFSET: LEGO1 0x100c28d0 STUB // OFFSET: LEGO1 0x100c28d0
void MxMIDIPresenter::StartingTickle() void MxMIDIPresenter::StartingTickle()
{ {
// TODO MxStreamChunk* chunk = FUN_100b5650();
if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) {
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Streaming;
}
} }
// OFFSET: LEGO1 0x100c2910 STUB // OFFSET: LEGO1 0x100c2910
void MxMIDIPresenter::StreamingTickle() void MxMIDIPresenter::StreamingTickle()
{ {
// TODO if (m_chunk) {
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Done;
}
else
m_chunk = NextChunk();
} }
// OFFSET: LEGO1 0x100c2940 // OFFSET: LEGO1 0x100c2940
@ -62,21 +87,42 @@ void MxMIDIPresenter::DoneTickle()
EndAction(); EndAction();
} }
// OFFSET: LEGO1 0x100c2960 STUB // OFFSET: LEGO1 0x100c2960
void MxMIDIPresenter::Destroy() void MxMIDIPresenter::Destroy()
{ {
// TODO Destroy(FALSE);
} }
// OFFSET: LEGO1 0x100c2970 STUB // OFFSET: LEGO1 0x100c2970
undefined4 MxMIDIPresenter::PutData() undefined4 MxMIDIPresenter::PutData()
{ {
// TODO m_criticalSection.Enter();
if (m_currentTickleState == TickleState_Streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
SetVolume(((MxDSSound*) m_action)->GetVolume());
if (MusicManager()->FUN_100c09c0(m_chunk->GetData(), 1))
EndAction();
}
m_criticalSection.Leave();
return 0; return 0;
} }
// OFFSET: LEGO1 0x100c29e0 STUB // OFFSET: LEGO1 0x100c29e0
void MxMIDIPresenter::EndAction() void MxMIDIPresenter::EndAction()
{ {
// TODO if (m_action) {
MxAutoLocker lock(&m_criticalSection);
MxMediaPresenter::EndAction();
MusicManager()->DeinitializeMIDI();
}
}
// OFFSET: LEGO1 0x100c2a60
void MxMIDIPresenter::SetVolume(MxS32 p_volume)
{
m_volume = p_volume;
MusicManager()->SetMultiplier(p_volume);
} }

19
LEGO1/mxmidipresenter.h
View File

@ -2,6 +2,7 @@
#define MXMIDIPRESENTER_H #define MXMIDIPRESENTER_H
#include "mxmusicpresenter.h" #include "mxmusicpresenter.h"
#include "mxstreamchunk.h"
// VTABLE 0x100dca20 // VTABLE 0x100dca20
// SIZE 0x58 // SIZE 0x58
@ -23,20 +24,20 @@ public:
return !strcmp(name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(name); return !strcmp(name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(name);
} }
virtual void ReadyTickle() override; // vtable+0x18 virtual void ReadyTickle() override; // vtable+0x18
virtual void StartingTickle() override; // vtable+0x1c virtual void StartingTickle() override; // vtable+0x1c
virtual void StreamingTickle() override; // vtable+0x20 virtual void StreamingTickle() override; // vtable+0x20
virtual void DoneTickle() override; // vtable+0x2c virtual void DoneTickle() override; // vtable+0x2c
virtual MxResult AddToManager() override; // vtable+0x34 virtual void Destroy() override; // vtable+0x38
virtual void Destroy() override; // vtable+0x38 virtual void EndAction() override; // vtable+0x40
virtual void EndAction() override; // vtable+0x40 virtual undefined4 PutData() override; // vtable+0x4c
virtual undefined4 PutData() override; // vtable+0x4c virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60
private: private:
void Init(); void Init();
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
undefined4 m_unk54; MxStreamChunk* m_chunk;
}; };
#endif // MXMIDIPRESENTER_H #endif // MXMIDIPRESENTER_H

16
LEGO1/mxmusicmanager.cpp
View File

@ -120,6 +120,15 @@ void MxMusicManager::SetVolume(MxS32 p_volume)
m_criticalSection.Leave(); m_criticalSection.Leave();
} }
// OFFSET: LEGO1 0x100c0970
void MxMusicManager::SetMultiplier(MxS32 p_multiplier)
{
m_criticalSection.Enter();
m_multiplier = p_multiplier;
SetMIDIVolume();
m_criticalSection.Leave();
}
// OFFSET: LEGO1 0x100c09a0 // OFFSET: LEGO1 0x100c09a0
MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume) MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
{ {
@ -127,6 +136,13 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume)
return (result << 0x10) | result; return (result << 0x10) | result;
} }
// OFFSET: LEGO1 0x100c09c0 STUB
undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, undefined4)
{
// TODO
return 0;
}
// OFFSET: LEGO1 0x100c0b20 // OFFSET: LEGO1 0x100c0b20
void MxMusicManager::DeinitializeMIDI() void MxMusicManager::DeinitializeMIDI()
{ {

5
LEGO1/mxmusicmanager.h
View File

@ -17,9 +17,12 @@ public:
inline MxBool GetMIDIInitialized() { return m_MIDIInitialized; } inline MxBool GetMIDIInitialized() { return m_MIDIInitialized; }
void DeinitializeMIDI();
undefined4 FUN_100c09c0(MxU8* p_data, undefined4);
void SetMultiplier(MxS32 p_multiplier);
private: private:
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
void DeinitializeMIDI();
MxS32 CalculateVolume(MxS32 p_volume); MxS32 CalculateVolume(MxS32 p_volume);
void SetMIDIVolume(); void SetMIDIVolume();

4
LEGO1/mxmusicpresenter.cpp
View File

@ -29,9 +29,11 @@ void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
if (MusicManager()) { if (MusicManager()) {
MusicManager()->RemovePresenter(*this); MusicManager()->RemovePresenter(*this);
} }
m_criticalSection.Enter(); m_criticalSection.Enter();
Init(); Init();
m_criticalSection.Leave(); m_criticalSection.Leave();
if (!p_fromDestructor) { if (!p_fromDestructor) {
MxMediaPresenter::Destroy(FALSE); MxMediaPresenter::Destroy(FALSE);
} }
@ -41,10 +43,12 @@ void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
MxResult MxMusicPresenter::AddToManager() MxResult MxMusicPresenter::AddToManager()
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
if (MusicManager()) { if (MusicManager()) {
result = SUCCESS; result = SUCCESS;
MusicManager()->AddPresenter(*this); MusicManager()->AddPresenter(*this);
} }
return result; return result;
} }