isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-04-05 19:24:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename InitPresenters to Create, remove this keyword ()

Browse source
This commit is contained in:
Christian Semmler 2024-06-07 16:13:42 -04:00 • committed by GitHub
parent ba378eb224
commit 2147be19de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 29 additions and 29 deletions

6
LEGO1/omni/include/mxaudiomanager.h
View file

@ -11,11 +11,11 @@ public:
MxAudioManager();
~MxAudioManager() override;
MxResult InitPresenters() override; // vtable+14
void Destroy() override; // vtable+18
MxResult Create() override; // vtable+14
void Destroy() override; // vtable+18
// FUNCTION: LEGO1 0x10029910
virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28
virtual MxS32 GetVolume() { return m_volume; } // vtable+28
virtual void SetVolume(MxS32 p_volume); // vtable+2c

2
LEGO1/omni/include/mxmediamanager.h
View file

@ -16,7 +16,7 @@ public:
~MxMediaManager() override;
MxResult Tickle() override; // vtable+08
virtual MxResult InitPresenters(); // vtable+14
virtual MxResult Create(); // vtable+14
virtual void Destroy(); // vtable+18
virtual void RegisterPresenter(MxPresenter& p_presenter); // vtable+1c
virtual void UnregisterPresenter(MxPresenter& p_presenter); // vtable+20

20
LEGO1/omni/src/audio/mxaudiomanager.cpp
View file

@ -20,16 +20,16 @@ MxAudioManager::~MxAudioManager()
// FUNCTION: LEGO1 0x100b8df0
void MxAudioManager::Init()
{
this->m_volume = 100;
m_volume = 100;
}
// FUNCTION: LEGO1 0x100b8e00
void MxAudioManager::Destroy(MxBool p_fromDestructor)
{
this->m_criticalSection.Enter();
m_criticalSection.Enter();
g_count--;
Init();
this->m_criticalSection.Leave();
m_criticalSection.Leave();
if (!p_fromDestructor) {
MxMediaManager::Destroy();
@ -37,13 +37,13 @@ void MxAudioManager::Destroy(MxBool p_fromDestructor)
}
// FUNCTION: LEGO1 0x100b8e40
MxResult MxAudioManager::InitPresenters()
MxResult MxAudioManager::Create()
{
MxResult result = FAILURE;
MxBool success = FALSE;
if (MxMediaManager::InitPresenters() == SUCCESS) {
this->m_criticalSection.Enter();
if (MxMediaManager::Create() == SUCCESS) {
m_criticalSection.Enter();
success = TRUE;
result = SUCCESS;
g_count++;
@ -54,7 +54,7 @@ MxResult MxAudioManager::InitPresenters()
}
if (success) {
this->m_criticalSection.Leave();
m_criticalSection.Leave();
}
return result;
@ -69,7 +69,7 @@ void MxAudioManager::Destroy()
// FUNCTION: LEGO1 0x100b8ea0
void MxAudioManager::SetVolume(MxS32 p_volume)
{
this->m_criticalSection.Enter();
this->m_volume = p_volume;
this->m_criticalSection.Leave();
m_criticalSection.Enter();
m_volume = p_volume;
m_criticalSection.Leave();
}

2
LEGO1/omni/src/audio/mxmusicmanager.cpp
View file

@ -144,7 +144,7 @@ MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
MxResult status = FAILURE;
MxBool locked = FALSE;
if (MxAudioManager::InitPresenters() == SUCCESS) {
if (MxAudioManager::Create() == SUCCESS) {
if (p_createThread) {
m_criticalSection.Enter();
locked = TRUE;

16
LEGO1/omni/src/audio/mxsoundmanager.cpp
View file

@ -44,22 +44,22 @@ void MxSoundManager::Init()
// FUNCTION: LEGO1 0x100ae840
void MxSoundManager::Destroy(MxBool p_fromDestructor)
{
if (this->m_thread) {
this->m_thread->Terminate();
delete this->m_thread;
if (m_thread) {
m_thread->Terminate();
delete m_thread;
}
else {
TickleManager()->UnregisterClient(this);
}
this->m_criticalSection.Enter();
m_criticalSection.Enter();
if (this->m_dsBuffer) {
this->m_dsBuffer->Release();
if (m_dsBuffer) {
m_dsBuffer->Release();
}
Init();
this->m_criticalSection.Leave();
m_criticalSection.Leave();
if (!p_fromDestructor) {
MxAudioManager::Destroy();
@ -72,7 +72,7 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
MxResult status = FAILURE;
MxBool locked = FALSE;
if (MxAudioManager::InitPresenters() != SUCCESS) {
if (MxAudioManager::Create() != SUCCESS) {
goto done;
}

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

@ -13,9 +13,9 @@ void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
MSoundManager()->UnregisterPresenter(*this);
}
this->m_criticalSection.Enter();
m_criticalSection.Enter();
MxMediaPresenter::Init();
this->m_criticalSection.Leave();
m_criticalSection.Leave();
if (!p_fromDestructor) {
MxMediaPresenter::Destroy(FALSE);

2
LEGO1/omni/src/common/mxmediamanager.cpp
View file

@ -31,7 +31,7 @@ MxResult MxMediaManager::Init()
}
// FUNCTION: LEGO1 0x100b85e0
MxResult MxMediaManager::InitPresenters()
MxResult MxMediaManager::Create()
{
AUTOLOCK(m_criticalSection);

2
LEGO1/omni/src/event/mxeventmanager.cpp
View file

@ -45,7 +45,7 @@ MxResult MxEventManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
MxResult status = FAILURE;
MxBool locked = FALSE;
MxResult result = MxMediaManager::InitPresenters();
MxResult result = MxMediaManager::Create();
if (result == SUCCESS) {
if (p_createThread) {
this->m_criticalSection.Enter();

4
LEGO1/omni/src/video/mxvideomanager.cpp
View file

@ -146,7 +146,7 @@ MxResult MxVideoManager::VTable0x28(
m_unk0x60 = FALSE;
if (MxMediaManager::InitPresenters() != SUCCESS) {
if (MxMediaManager::Create() != SUCCESS) {
goto done;
}
@ -219,7 +219,7 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS,
m_unk0x60 = TRUE;
if (MxMediaManager::InitPresenters() != SUCCESS) {
if (MxMediaManager::Create() != SUCCESS) {
goto done;
}