isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 23:57:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rename MxDSSubscriber functions (#573)

Browse source
This commit is contained in:
Christian Semmler 2024-02-17 10:35:10 -05:00 committed by GitHub
parent 332d8da695
commit 1d189b013d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
View file

@ -49,7 +49,7 @@ void LegoLoadCacheSoundPresenter::ReadyTickle()
m_cacheSound = new LegoCacheSound; m_cacheSound = new LegoCacheSound;
memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat, sizeof(m_pcmWaveFormat)); memcpy(&m_pcmWaveFormat, &header->m_pcmWaveFormat, sizeof(m_pcmWaveFormat));
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ProgressTickleState(e_streaming); ProgressTickleState(e_streaming);
} }
} }

2
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
View file

@ -21,7 +21,7 @@ void LegoActionControlPresenter::ReadyTickle()
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
if (m_compositePresenter) { if (m_compositePresenter) {
if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) { if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) {
m_compositePresenter->VTable0x60(this); m_compositePresenter->VTable0x60(this);

4
LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
View file

@ -69,14 +69,14 @@ void LegoPathPresenter::ReadyTickle()
// FUNCTION: LEGO1 0x10044d00 // FUNCTION: LEGO1 0x10044d00
void LegoPathPresenter::StreamingTickle() void LegoPathPresenter::StreamingTickle()
{ {
MxStreamChunk* chunk = m_subscriber->NextChunk(); MxStreamChunk* chunk = m_subscriber->PopData();
if (chunk) { if (chunk) {
if (chunk->GetFlags() & MxStreamChunk::c_end) { if (chunk->GetFlags() & MxStreamChunk::c_end) {
ProgressTickleState(e_repeating); ProgressTickleState(e_repeating);
} }
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
} }

12
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View file

@ -105,12 +105,12 @@ void LegoAnimPresenter::ReadyTickle()
m_currentWorld = CurrentWorld(); m_currentWorld = CurrentWorld();
if (m_currentWorld) { if (m_currentWorld) {
MxStreamChunk* chunk = m_subscriber->CurrentChunk(); MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) { if (chunk && chunk->GetTime() + m_action->GetStartTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->NextChunk(); chunk = m_subscriber->PopData();
MxResult result = VTable0x88(chunk); MxResult result = VTable0x88(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) { if (result == SUCCESS) {
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
@ -134,9 +134,9 @@ void LegoAnimPresenter::StartingTickle()
// FUNCTION: LEGO1 0x1006b840 // FUNCTION: LEGO1 0x1006b840
void LegoAnimPresenter::StreamingTickle() void LegoAnimPresenter::StreamingTickle()
{ {
if (m_subscriber->CurrentChunk()) { if (m_subscriber->PeekData()) {
MxStreamChunk* chunk = m_subscriber->NextChunk(); MxStreamChunk* chunk = m_subscriber->PopData();
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
if (m_unk0x95) { if (m_unk0x95) {

8
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View file

@ -80,12 +80,12 @@ void LegoModelPresenter::ReadyTickle()
EndAction(); EndAction();
} }
else { else {
MxStreamChunk* chunk = m_subscriber->CurrentChunk(); MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk != NULL && chunk->GetTime() <= m_action->GetElapsedTime()) { if (chunk != NULL && chunk->GetTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->NextChunk(); chunk = m_subscriber->PopData();
MxResult result = CreateROI(chunk); MxResult result = CreateROI(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) { if (result == SUCCESS) {
VideoManager()->Get3DManager()->GetLego3DView()->Add(*m_roi); VideoManager()->Get3DManager()->GetLego3DView()->Add(*m_roi);
@ -135,7 +135,7 @@ void LegoModelPresenter::ParseExtra()
list<LegoROI*>& roiList = currentWorld->GetUnknownList0xe0(); list<LegoROI*>& roiList = currentWorld->GetUnknownList0xe0();
for (list<LegoROI*>::iterator it = roiList.begin(); it != roiList.end(); it++) { for (list<LegoROI*>::iterator it = roiList.begin(); it != roiList.end(); it++) {
if (!strcmpi(((LegoROI*) (*it))->GetName(), output)) { if (!strcmpi((*it)->GetName(), output)) {
m_roi = *it; m_roi = *it;
roiList.erase(it); roiList.erase(it);

6
LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp
View file

@ -73,15 +73,15 @@ MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk)
// FUNCTION: LEGO1 0x1007a230 // FUNCTION: LEGO1 0x1007a230
void LegoPalettePresenter::ReadyTickle() void LegoPalettePresenter::ReadyTickle()
{ {
MxStreamChunk* chunk = m_subscriber->CurrentChunk(); MxStreamChunk* chunk = m_subscriber->PeekData();
if (chunk) { if (chunk) {
if (chunk->GetTime() <= m_action->GetElapsedTime()) { if (chunk->GetTime() <= m_action->GetElapsedTime()) {
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
chunk = m_subscriber->NextChunk(); chunk = m_subscriber->PopData();
MxResult result = ParsePalette(chunk); MxResult result = ParsePalette(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
if (result == SUCCESS) { if (result == SUCCESS) {
VideoManager()->RealizePalette(m_palette); VideoManager()->RealizePalette(m_palette);

10
LEGO1/omni/include/mxdssubscriber.h
View file

@ -30,11 +30,11 @@ class MxDSSubscriber : public MxCore {
} }
MxResult Create(MxStreamController* p_controller, MxU32 p_objectId, MxS16 p_unk0x48); MxResult Create(MxStreamController* p_controller, MxU32 p_objectId, MxS16 p_unk0x48);
void DeleteChunks(); void DestroyData();
MxResult AddChunk(MxStreamChunk* p_chunk, MxBool p_append); MxResult AddData(MxStreamChunk* p_chunk, MxBool p_append);
MxStreamChunk* NextChunk(); MxStreamChunk* PopData();
MxStreamChunk* CurrentChunk(); MxStreamChunk* PeekData();
void DestroyChunk(MxStreamChunk* p_chunk); void FreeDataChunk(MxStreamChunk* p_chunk);
inline MxU32 GetObjectId() { return m_objectId; } inline MxU32 GetObjectId() { return m_objectId; }
inline MxS16 GetUnknown48() { return m_unk0x48; } inline MxS16 GetUnknown48() { return m_unk0x48; }

4
LEGO1/omni/src/audio/mxmidipresenter.cpp
View file

@ -35,7 +35,7 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
m_criticalSection.Enter(); m_criticalSection.Enter();
if (m_subscriber && m_chunk) { if (m_subscriber && m_chunk) {
m_subscriber->DestroyChunk(m_chunk); m_subscriber->FreeDataChunk(m_chunk);
} }
Init(); Init();
@ -52,7 +52,7 @@ void MxMIDIPresenter::ReadyTickle()
MxStreamChunk* chunk = NextChunk(); MxStreamChunk* chunk = NextChunk();
if (chunk) { if (chunk) {
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
} }

6
LEGO1/omni/src/audio/mxwavepresenter.cpp
View file

@ -119,7 +119,7 @@ void MxWavePresenter::ReadyTickle()
if (chunk) { if (chunk) {
m_waveFormat = (WaveFormat*) new MxU8[chunk->GetLength()]; m_waveFormat = (WaveFormat*) new MxU8[chunk->GetLength()];
memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength()); memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength());
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
} }
@ -232,7 +232,7 @@ void MxWavePresenter::LoopChunk(MxStreamChunk* p_chunk)
{ {
WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength()); WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength());
if (IsEnabled()) { if (IsEnabled()) {
m_subscriber->DestroyChunk(p_chunk); m_subscriber->FreeDataChunk(p_chunk);
} }
} }
@ -246,7 +246,7 @@ MxResult MxWavePresenter::PutData()
case e_streaming: case e_streaming:
if (m_currentChunk && FUN_100b1ba0()) { if (m_currentChunk && FUN_100b1ba0()) {
WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength()); WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength());
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
m_currentChunk = NULL; m_currentChunk = NULL;
} }

16
LEGO1/omni/src/common/mxmediapresenter.cpp
View file

@ -27,7 +27,7 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor)
MxAutoLocker lock(&m_criticalSection); MxAutoLocker lock(&m_criticalSection);
if (m_currentChunk && m_subscriber) { if (m_currentChunk && m_subscriber) {
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
} }
if (m_subscriber) { if (m_subscriber) {
@ -63,12 +63,12 @@ MxStreamChunk* MxMediaPresenter::CurrentChunk()
MxStreamChunk* chunk = NULL; MxStreamChunk* chunk = NULL;
if (m_subscriber) { if (m_subscriber) {
chunk = m_subscriber->CurrentChunk(); chunk = m_subscriber->PeekData();
if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) { if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) {
m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7); m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7);
m_subscriber->NextChunk(); m_subscriber->PopData();
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
chunk = NULL; chunk = NULL;
ProgressTickleState(e_done); ProgressTickleState(e_done);
} }
@ -83,11 +83,11 @@ MxStreamChunk* MxMediaPresenter::NextChunk()
MxStreamChunk* chunk = NULL; MxStreamChunk* chunk = NULL;
if (m_subscriber) { if (m_subscriber) {
chunk = m_subscriber->NextChunk(); chunk = m_subscriber->PopData();
if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) { if (chunk && chunk->GetFlags() & MxDSChunk::c_bit3) {
m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7); m_action->SetFlags(m_action->GetFlags() | MxDSAction::c_bit7);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
chunk = NULL; chunk = NULL;
ProgressTickleState(e_done); ProgressTickleState(e_done);
} }
@ -186,7 +186,7 @@ void MxMediaPresenter::StreamingTickle()
if (m_currentChunk) { if (m_currentChunk) {
if (m_currentChunk->GetFlags() & MxDSChunk::c_end) { if (m_currentChunk->GetFlags() & MxDSChunk::c_end) {
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
m_currentChunk = NULL; m_currentChunk = NULL;
ProgressTickleState(e_repeating); ProgressTickleState(e_repeating);
} }
@ -194,7 +194,7 @@ void MxMediaPresenter::StreamingTickle()
LoopChunk(m_currentChunk); LoopChunk(m_currentChunk);
if (!IsEnabled()) { if (!IsEnabled()) {
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
m_currentChunk = NULL; m_currentChunk = NULL;
} }
} }

4
LEGO1/omni/src/event/mxeventpresenter.cpp
View file

@ -71,7 +71,7 @@ void MxEventPresenter::ReadyTickle()
if (chunk) { if (chunk) {
CopyData(chunk); CopyData(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
} }
@ -107,7 +107,7 @@ MxResult MxEventPresenter::PutData()
} }
if (m_currentTickleState == e_streaming) { if (m_currentTickleState == e_streaming) {
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
} }
m_currentChunk = NULL; m_currentChunk = NULL;
} }

12
LEGO1/omni/src/stream/mxdssubscriber.cpp
View file

@ -20,7 +20,7 @@ MxDSSubscriber::~MxDSSubscriber()
m_controller->RemoveSubscriber(this); m_controller->RemoveSubscriber(this);
} }
DeleteChunks(); DestroyData();
if (m_pendingChunkCursor) { if (m_pendingChunkCursor) {
delete m_pendingChunkCursor; delete m_pendingChunkCursor;
@ -59,7 +59,7 @@ MxResult MxDSSubscriber::Create(MxStreamController* p_controller, MxU32 p_object
} }
// FUNCTION: LEGO1 0x100b8030 // FUNCTION: LEGO1 0x100b8030
void MxDSSubscriber::DeleteChunks() void MxDSSubscriber::DestroyData()
{ {
if (m_controller) { if (m_controller) {
MxStreamChunk* chunk = NULL; MxStreamChunk* chunk = NULL;
@ -77,7 +77,7 @@ void MxDSSubscriber::DeleteChunks()
} }
// FUNCTION: LEGO1 0x100b8150 // FUNCTION: LEGO1 0x100b8150
MxResult MxDSSubscriber::AddChunk(MxStreamChunk* p_chunk, MxBool p_append) MxResult MxDSSubscriber::AddData(MxStreamChunk* p_chunk, MxBool p_append)
{ {
if (m_pendingChunkCursor) { if (m_pendingChunkCursor) {
if (p_append) { if (p_append) {
@ -92,7 +92,7 @@ MxResult MxDSSubscriber::AddChunk(MxStreamChunk* p_chunk, MxBool p_append)
} }
// FUNCTION: LEGO1 0x100b8250 // FUNCTION: LEGO1 0x100b8250
MxStreamChunk* MxDSSubscriber::NextChunk() MxStreamChunk* MxDSSubscriber::PopData()
{ {
MxStreamChunk* chunk = NULL; MxStreamChunk* chunk = NULL;
@ -109,7 +109,7 @@ MxStreamChunk* MxDSSubscriber::NextChunk()
} }
// FUNCTION: LEGO1 0x100b8360 // FUNCTION: LEGO1 0x100b8360
MxStreamChunk* MxDSSubscriber::CurrentChunk() MxStreamChunk* MxDSSubscriber::PeekData()
{ {
MxStreamChunk* chunk = NULL; MxStreamChunk* chunk = NULL;
@ -121,7 +121,7 @@ MxStreamChunk* MxDSSubscriber::CurrentChunk()
} }
// FUNCTION: LEGO1 0x100b8390 // FUNCTION: LEGO1 0x100b8390
void MxDSSubscriber::DestroyChunk(MxStreamChunk* p_chunk) void MxDSSubscriber::FreeDataChunk(MxStreamChunk* p_chunk)
{ {
if (p_chunk) { if (p_chunk) {
if (m_consumedChunkCursor->Find(p_chunk)) { if (m_consumedChunkCursor->Find(p_chunk)) {

2
LEGO1/omni/src/stream/mxstreamchunk.cpp
View file

@ -59,7 +59,7 @@ MxResult MxStreamChunk::SendChunk(MxStreamListMxDSSubscriber& p_subscriberList,
m_buffer = NULL; m_buffer = NULL;
} }
(*it)->AddChunk(this, p_append); (*it)->AddData(this, p_append);
return SUCCESS; return SUCCESS;
} }

2
LEGO1/omni/src/video/mxloopingflcpresenter.cpp
View file

@ -50,7 +50,7 @@ void MxLoopingFlcPresenter::NextFrame()
m_elapsedDuration += m_flcHeader->speed; m_elapsedDuration += m_flcHeader->speed;
} }
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
// FUNCTION: LEGO1 0x100b44c0 // FUNCTION: LEGO1 0x100b44c0

2
LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
View file

@ -61,7 +61,7 @@ void MxLoopingSmkPresenter::NextFrame()
m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond(); m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond();
} }
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
// FUNCTION: LEGO1 0x100b4a90 // FUNCTION: LEGO1 0x100b4a90

2
LEGO1/omni/src/video/mxstillpresenter.cpp
View file

@ -62,7 +62,7 @@ void MxStillPresenter::NextFrame()
{ {
MxStreamChunk* chunk = NextChunk(); MxStreamChunk* chunk = NextChunk();
LoadFrame(chunk); LoadFrame(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
// FUNCTION: LEGO1 0x100b9dd0 // FUNCTION: LEGO1 0x100b9dd0

8
LEGO1/omni/src/video/mxvideopresenter.cpp
View file

@ -178,12 +178,12 @@ void MxVideoPresenter::NextFrame()
MxStreamChunk* chunk = NextChunk(); MxStreamChunk* chunk = NextChunk();
if (chunk->GetFlags() & MxDSChunk::c_end) { if (chunk->GetFlags() & MxDSChunk::c_end) {
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ProgressTickleState(e_repeating); ProgressTickleState(e_repeating);
} }
else { else {
LoadFrame(chunk); LoadFrame(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
} }
} }
@ -408,7 +408,7 @@ void MxVideoPresenter::ReadyTickle()
if (chunk) { if (chunk) {
LoadHeader(chunk); LoadHeader(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->FreeDataChunk(chunk);
ParseExtra(); ParseExtra();
ProgressTickleState(e_starting); ProgressTickleState(e_starting);
} }
@ -453,7 +453,7 @@ void MxVideoPresenter::StreamingTickle()
} }
LoadFrame(m_currentChunk); LoadFrame(m_currentChunk);
m_subscriber->DestroyChunk(m_currentChunk); m_subscriber->FreeDataChunk(m_currentChunk);
m_currentChunk = NULL; m_currentChunk = NULL;
SetBit0(TRUE); SetBit0(TRUE);