From 4ea7687f03970d596b7db82c1d83a4f08eff100c Mon Sep 17 00:00:00 2001 From: disinvite Date: Tue, 12 Mar 2024 09:19:58 -0400 Subject: [PATCH] MxAutoLock --- CMakeLists.txt | 2 +- .../legoomni/src/audio/legosoundmanager.cpp | 2 +- .../src/common/mxcompositemediapresenter.cpp | 2 +- .../legoomni/src/entity/legoworldpresenter.cpp | 2 +- .../legoomni/src/input/legoinputmanager.cpp | 2 +- LEGO1/lego/legoomni/src/main/legoomni.cpp | 2 +- .../legoomni/src/paths/legopathpresenter.cpp | 2 +- LEGO1/omni/include/mxautolock.h | 17 +++++++++++++++++ LEGO1/omni/include/mxautolocker.h | 17 ----------------- LEGO1/omni/src/audio/mxmidipresenter.cpp | 2 +- LEGO1/omni/src/audio/mxsoundmanager.cpp | 2 +- LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +- LEGO1/omni/src/common/mxcompositepresenter.cpp | 2 +- LEGO1/omni/src/common/mxmediamanager.cpp | 2 +- LEGO1/omni/src/common/mxmediapresenter.cpp | 2 +- LEGO1/omni/src/common/mxpresenter.cpp | 2 +- LEGO1/omni/src/event/mxeventpresenter.cpp | 2 +- LEGO1/omni/src/main/mxomni.cpp | 2 +- LEGO1/omni/src/notify/mxnotificationmanager.cpp | 2 +- .../omni/src/stream/mxdiskstreamcontroller.cpp | 2 +- LEGO1/omni/src/stream/mxdiskstreamprovider.cpp | 2 +- LEGO1/omni/src/stream/mxramstreamcontroller.cpp | 2 +- LEGO1/omni/src/stream/mxstreamcontroller.cpp | 2 +- .../system/{mxautolocker.cpp => mxautolock.cpp} | 6 +++--- LEGO1/omni/src/video/mxloopingsmkpresenter.cpp | 2 +- LEGO1/omni/src/video/mxvideomanager.cpp | 2 +- LEGO1/omni/src/video/mxvideopresenter.cpp | 2 +- 27 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 LEGO1/omni/include/mxautolock.h delete mode 100644 LEGO1/omni/include/mxautolocker.h rename LEGO1/omni/src/system/{mxautolocker.cpp => mxautolock.cpp} (68%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 806e56ce..c1b52a8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ add_library(omni STATIC LEGO1/omni/src/stream/mxstreamer.cpp LEGO1/omni/src/stream/mxstreamlist.cpp LEGO1/omni/src/stream/mxstreamprovider.cpp - LEGO1/omni/src/system/mxautolocker.cpp + LEGO1/omni/src/system/mxautolock.cpp LEGO1/omni/src/system/mxcriticalsection.cpp LEGO1/omni/src/system/mxscheduler.cpp LEGO1/omni/src/system/mxsemaphore.cpp diff --git a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp index 5c90518e..f3476e8e 100644 --- a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp @@ -1,6 +1,6 @@ #include "legosoundmanager.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxomni.h" // FUNCTION: LEGO1 0x100298a0 diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp index 31b003eb..8f074ffa 100644 --- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp @@ -3,7 +3,7 @@ #include "legosoundmanager.h" #include "legovideomanager.h" #include "misc.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmultiaction.h" #include "mxmediapresenter.h" #include "mxmisc.h" diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index b2d30605..76253d89 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -15,7 +15,7 @@ #include "misc.h" #include "modeldb/modeldb.h" #include "mxactionnotificationparam.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsactionlist.h" #include "mxdschunk.h" #include "mxdsmediaaction.h" diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp index a0e02efc..61f6c815 100644 --- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp +++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp @@ -4,7 +4,7 @@ #include "legoomni.h" #include "legovideomanager.h" #include "misc.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "roi/legoroi.h" DECOMP_SIZE_ASSERT(LegoInputManager, 0x338) diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index 43504c3e..32b40120 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -16,7 +16,7 @@ #include "misc.h" #include "misc/legocontainer.h" #include "mxactionnotificationparam.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxbackgroundaudiomanager.h" #include "mxdsfile.h" #include "mxmisc.h" diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index cf647592..db02e525 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -2,7 +2,7 @@ #include "legovideomanager.h" #include "misc.h" -#include "mxautolocker.h" +#include "mxautolock.h" DECOMP_SIZE_ASSERT(LegoPathPresenter, 0x54); diff --git a/LEGO1/omni/include/mxautolock.h b/LEGO1/omni/include/mxautolock.h new file mode 100644 index 00000000..61582ac3 --- /dev/null +++ b/LEGO1/omni/include/mxautolock.h @@ -0,0 +1,17 @@ +#ifndef MXAUTOLOCK_H +#define MXAUTOLOCK_H + +#include "mxcriticalsection.h" + +#define AUTOLOCK(CS) MxAutoLock lock(&CS); + +class MxAutoLock { +public: + MxAutoLock(MxCriticalSection* p_criticalSection); + ~MxAutoLock(); + +private: + MxCriticalSection* m_criticalSection; +}; + +#endif // MXAUTOLOCK_H diff --git a/LEGO1/omni/include/mxautolocker.h b/LEGO1/omni/include/mxautolocker.h deleted file mode 100644 index bbd1a8aa..00000000 --- a/LEGO1/omni/include/mxautolocker.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MXAUTOLOCKER_H -#define MXAUTOLOCKER_H - -#include "mxcriticalsection.h" - -#define AUTOLOCK(CS) MxAutoLocker lock(&CS); - -class MxAutoLocker { -public: - MxAutoLocker(MxCriticalSection* p_criticalSection); - ~MxAutoLocker(); - -private: - MxCriticalSection* m_criticalSection; -}; - -#endif // MXAUTOLOCKER_H diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp index d6da2450..205b760d 100644 --- a/LEGO1/omni/src/audio/mxmidipresenter.cpp +++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp @@ -1,7 +1,7 @@ #include "mxmidipresenter.h" #include "decomp.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdssound.h" #include "mxmisc.h" #include "mxmusicmanager.h" diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp index e36ed518..0d9359e6 100644 --- a/LEGO1/omni/src/audio/mxsoundmanager.cpp +++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp @@ -1,7 +1,7 @@ #include "mxsoundmanager.h" #include "define.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxmisc.h" #include "mxomni.h" #include "mxpresenter.h" diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index 3d186448..bd02bf8d 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" #include "define.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdssound.h" #include "mxmisc.h" #include "mxomni.h" diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp index 275f556f..5d5d8c6f 100644 --- a/LEGO1/omni/src/common/mxcompositepresenter.cpp +++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp @@ -1,7 +1,7 @@ #include "mxcompositepresenter.h" #include "decomp.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmultiaction.h" #include "mxmisc.h" #include "mxnotificationmanager.h" diff --git a/LEGO1/omni/src/common/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp index 0bf02912..bd32c70b 100644 --- a/LEGO1/omni/src/common/mxmediamanager.cpp +++ b/LEGO1/omni/src/common/mxmediamanager.cpp @@ -1,7 +1,7 @@ #include "mxmediamanager.h" #include "decomp.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxomni.h" #include "mxpresenter.h" #include "mxticklemanager.h" diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp index 9a321b04..fe43cca7 100644 --- a/LEGO1/omni/src/common/mxmediapresenter.cpp +++ b/LEGO1/omni/src/common/mxmediapresenter.cpp @@ -1,7 +1,7 @@ #include "mxmediapresenter.h" #include "mxactionnotificationparam.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxcompositepresenter.h" #include "mxmisc.h" #include "mxnotificationmanager.h" diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index 64ad4638..76cbd880 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -3,7 +3,7 @@ #include "decomp.h" #include "define.h" #include "mxactionnotificationparam.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxcompositepresenter.h" #include "mxdsanim.h" #include "mxdssound.h" diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp index 329fcace..70a3c6af 100644 --- a/LEGO1/omni/src/event/mxeventpresenter.cpp +++ b/LEGO1/omni/src/event/mxeventpresenter.cpp @@ -1,7 +1,7 @@ #include "mxeventpresenter.h" #include "decomp.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxeventmanager.h" #include "mxmisc.h" #include "mxvariabletable.h" diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp index 1e84405e..70bb751c 100644 --- a/LEGO1/omni/src/main/mxomni.cpp +++ b/LEGO1/omni/src/main/mxomni.cpp @@ -2,7 +2,7 @@ #include "mxactionnotificationparam.h" #include "mxatom.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmultiaction.h" #include "mxeventmanager.h" #include "mxmisc.h" diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp index d1315d77..21907d2c 100644 --- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp +++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp @@ -2,7 +2,7 @@ #include "compat.h" #include "decomp.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxmisc.h" #include "mxparam.h" #include "mxticklemanager.h" diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp index 3761c7c6..69b11054 100644 --- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp @@ -1,7 +1,7 @@ #include "mxdiskstreamcontroller.h" #include "mxactionnotificationparam.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdiskstreamprovider.h" #include "mxdsstreamingaction.h" #include "mxmisc.h" diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp index 151a78da..d316912d 100644 --- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp +++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp @@ -1,6 +1,6 @@ #include "mxdiskstreamprovider.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdiskstreamcontroller.h" #include "mxdsbuffer.h" #include "mxdsstreamingaction.h" diff --git a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp index 9a859c39..dea72610 100644 --- a/LEGO1/omni/src/stream/mxramstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp @@ -1,6 +1,6 @@ #include "mxramstreamcontroller.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsstreamingaction.h" #include "mxramstreamprovider.h" diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index 50bacc26..a94cd974 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -1,6 +1,6 @@ #include "mxstreamcontroller.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmultiaction.h" #include "mxdsstreamingaction.h" #include "mxmisc.h" diff --git a/LEGO1/omni/src/system/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolock.cpp similarity index 68% rename from LEGO1/omni/src/system/mxautolocker.cpp rename to LEGO1/omni/src/system/mxautolock.cpp index 3c5a2afb..56a5a977 100644 --- a/LEGO1/omni/src/system/mxautolocker.cpp +++ b/LEGO1/omni/src/system/mxautolock.cpp @@ -1,7 +1,7 @@ -#include "mxautolocker.h" +#include "mxautolock.h" // FUNCTION: LEGO1 0x100b8ed0 -MxAutoLocker::MxAutoLocker(MxCriticalSection* p_criticalSection) +MxAutoLock::MxAutoLock(MxCriticalSection* p_criticalSection) { this->m_criticalSection = p_criticalSection; if (this->m_criticalSection != 0) { @@ -10,7 +10,7 @@ MxAutoLocker::MxAutoLocker(MxCriticalSection* p_criticalSection) } // FUNCTION: LEGO1 0x100b8ef0 -MxAutoLocker::~MxAutoLocker() +MxAutoLock::~MxAutoLock() { if (this->m_criticalSection != 0) { this->m_criticalSection->Leave(); diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp index 97052d74..af73b59a 100644 --- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp +++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp @@ -1,6 +1,6 @@ #include "mxloopingsmkpresenter.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmediaaction.h" DECOMP_SIZE_ASSERT(MxLoopingSmkPresenter, 0x724); diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp index cac162e5..14b99a7e 100644 --- a/LEGO1/omni/src/video/mxvideomanager.cpp +++ b/LEGO1/omni/src/video/mxvideomanager.cpp @@ -1,6 +1,6 @@ #include "mxvideomanager.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxmisc.h" #include "mxomni.h" #include "mxpresenter.h" diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp index eb8c10d4..41871b33 100644 --- a/LEGO1/omni/src/video/mxvideopresenter.cpp +++ b/LEGO1/omni/src/video/mxvideopresenter.cpp @@ -1,6 +1,6 @@ #include "mxvideopresenter.h" -#include "mxautolocker.h" +#include "mxautolock.h" #include "mxdsmediaaction.h" #include "mxmisc.h" #include "mxregioncursor.h"