MxAutoLock

2026-01-28 18:51:16 +00:00 · 2024-03-12 09:19:58 -04:00 · 2024-03-12 09:19:58 -04:00 · 4ea7687f03
commit 4ea7687f03
parent d609f97653
27 changed files with 44 additions and 44 deletions
--- 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
--- 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
--- 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"
--- 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"
--- 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)
--- 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"
--- 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);

--- a/LEGO1/omni/include/mxautolock.h
+++ 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
--- a/LEGO1/omni/include/mxautolocker.h
+++ b/LEGO1/omni/include/mxautolocker.h
@ -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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- a/LEGO1/omni/src/system/mxautolocker.cpp
+++ b/LEGO1/omni/src/system/mxautolocker.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();
--- 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);
--- 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"
--- 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"