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

Beta match MxAutoLock and MxCriticalSection (#1638)

Browse Source 
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2025-07-20 07:57:26 +02:00
committed by GitHub
parent 9e860d910c
commit 6b5f3724c0
26 changed files with 103 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/omni/src/audio/mxaudiomanager.cpp
View File

@@ -26,7 +26,7 @@ void MxAudioManager::Init()
// FUNCTION: LEGO1 0x100b8e00
void MxAudioManager::Destroy(MxBool p_fromDestructor)
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
g_count--;
Init();
m_criticalSection.Leave();
@@ -43,7 +43,7 @@ MxResult MxAudioManager::Create()
MxBool success = FALSE;
if (MxMediaManager::Create() == SUCCESS) {
m_criticalSection.Enter();
ENTER(m_criticalSection);
success = TRUE;
result = SUCCESS;
g_count++;
@@ -69,7 +69,7 @@ void MxAudioManager::Destroy()
// FUNCTION: LEGO1 0x100b8ea0
void MxAudioManager::SetVolume(MxS32 p_volume)
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
m_volume = p_volume;
m_criticalSection.Leave();
}

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

@@ -39,7 +39,7 @@ void MxLoopingMIDIPresenter::DoneTickle()
// FUNCTION: LEGO1 0x100c2b00
MxResult MxLoopingMIDIPresenter::PutData()
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
SetVolume(((MxDSSound*) m_action)->GetVolume());

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

@@ -34,7 +34,7 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
MusicManager()->DeinitializeMIDI();
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (m_subscriber && m_chunk) {
m_subscriber->FreeDataChunk(m_chunk);
@@ -98,7 +98,7 @@ void MxMIDIPresenter::Destroy()
// FUNCTION: LEGO1 0x100c2970
MxResult MxMIDIPresenter::PutData()
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (m_currentTickleState == e_streaming && m_chunk && !MusicManager()->GetMIDIInitialized()) {
SetVolume(((MxDSSound*) m_action)->GetVolume());

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

@@ -53,7 +53,7 @@ void MxMusicManager::Destroy(MxBool p_fromDestructor)
TickleManager()->UnregisterClient(this);
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
DeinitializeMIDI();
Init();
m_criticalSection.Leave();
@@ -146,7 +146,7 @@ MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
if (MxAudioManager::Create() == SUCCESS) {
if (p_createThread) {
m_criticalSection.Enter();
ENTER(m_criticalSection);
locked = TRUE;
m_thread = new MxTickleThread(this, p_frequencyMS);
@@ -183,7 +183,7 @@ void MxMusicManager::Destroy()
void MxMusicManager::SetVolume(MxS32 p_volume)
{
MxAudioManager::SetVolume(p_volume);
m_criticalSection.Enter();
ENTER(m_criticalSection);
SetMIDIVolume();
m_criticalSection.Leave();
}
@@ -191,7 +191,7 @@ void MxMusicManager::SetVolume(MxS32 p_volume)
// FUNCTION: LEGO1 0x100c0970
void MxMusicManager::SetMultiplier(MxS32 p_multiplier)
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
m_multiplier = p_multiplier;
SetMIDIVolume();
m_criticalSection.Leave();
@@ -209,7 +209,7 @@ MxResult MxMusicManager::InitializeMIDI(MxU8* p_data, MxS32 p_loopCount)
{
MxResult result = FAILURE;
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (!m_midiInitialized) {
MxU32 total = midiOutGetNumDevs();
@@ -278,7 +278,7 @@ done:
// FUNCTION: LEGO1 0x100c0b20
void MxMusicManager::DeinitializeMIDI()
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (m_midiInitialized) {
m_midiInitialized = FALSE;

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

@@ -30,7 +30,7 @@ void MxMusicPresenter::Destroy(MxBool p_fromDestructor)
MusicManager()->UnregisterPresenter(*this);
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
Init();
m_criticalSection.Leave();

6
LEGO1/omni/src/audio/mxsoundmanager.cpp
View File

@@ -52,7 +52,7 @@ void MxSoundManager::Destroy(MxBool p_fromDestructor)
TickleManager()->UnregisterClient(this);
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
if (m_dsBuffer) {
m_dsBuffer->Release();
@@ -77,7 +77,7 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
goto done;
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
locked = TRUE;
if (DirectSoundCreate(NULL, &m_directSound, NULL) != DS_OK) {
@@ -166,7 +166,7 @@ void MxSoundManager::SetVolume(MxS32 p_volume)
{
MxAudioManager::SetVolume(p_volume);
m_criticalSection.Enter();
ENTER(m_criticalSection);
MxPresenter* presenter;
MxPresenterListCursor cursor(m_presenters);

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

@@ -13,7 +13,7 @@ void MxSoundPresenter::Destroy(MxBool p_fromDestructor)
MSoundManager()->UnregisterPresenter(*this);
}
m_criticalSection.Enter();
ENTER(m_criticalSection);
MxMediaPresenter::Init();
m_criticalSection.Leave();

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

@@ -294,7 +294,7 @@ void MxWavePresenter::EndAction()
// FUNCTION: LEGO1 0x100b2300
void MxWavePresenter::SetVolume(MxS32 p_volume)
{
m_criticalSection.Enter();
ENTER(m_criticalSection);
m_volume = p_volume;
if (m_dsBuffer != NULL) {