diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-27 21:19:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-27 21:19:33 -0800 |
| commit | 6f96e665186c87f15acb6f5cb8d27665afee3130 (patch) | |
| tree | 3ea70fe7d635a0f55aae44b1a386814766a46597 /src/JSystem/JAudio2/JASCallback.cpp | |
| parent | 767caeecc3e374779cccc9960b6546b74e7a9e50 (diff) | |
various Z2Audio / JAudio debug cleanup (#2876)
* some JAudio work
* audio cleanup checkpoint
* checkpoint more audio cleanup
* fix symbols
* more z2 cleanup
* fix regression
* fix build
* some fixes
Diffstat (limited to 'src/JSystem/JAudio2/JASCallback.cpp')
| -rw-r--r-- | src/JSystem/JAudio2/JASCallback.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp index 18d29ce4f5..b67f3848d1 100644 --- a/src/JSystem/JAudio2/JASCallback.cpp +++ b/src/JSystem/JAudio2/JASCallback.cpp @@ -1,8 +1,3 @@ -// -// Generated By: dol2asm -// Translation Unit: JASCallback -// - #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASCallback.h" @@ -10,28 +5,28 @@ /* 8028FFA8-80290030 28A8E8 0088+00 0/0 2/2 0/0 .text regist__14JASCallbackMgrFPFPv_lPv */ -bool JASCallbackMgr::regist(JASCallback* function, void* argument) -{ +bool JASCallbackMgr::regist(JASCallback* callback, void* argument) { JASCriticalSection criticalSection; - for (int i = 0; i < 0x20; i++) { - if (mCallbacks[i].mFunction == NULL) { - mCallbacks[i].mFunction = function; - mCallbacks[i].mArgument = argument; + for (int i = 0; i < NUM_CALLBACKS; i++) { + if (callbacks_[i].callback_ == NULL) { + callbacks_[i].callback_ = callback; + callbacks_[i].arg_ = argument; return true; } } + return false; } /* 80290030-802900C4 28A970 0094+00 0/0 1/1 0/0 .text reject__14JASCallbackMgrFPFPv_lPv */ -int JASCallbackMgr::reject(JASCallback* function, void* argument) { +int JASCallbackMgr::reject(JASCallback* callback, void* argument) { int rejectNum = 0; JASCriticalSection criticalSection; - for (int i = 0; i < 0x20; i++) { - if (mCallbacks[i].mFunction == function && mCallbacks[i].mArgument == argument) { - mCallbacks[i].mFunction = NULL; - mCallbacks[i].mArgument = NULL; + for (int i = 0; i < NUM_CALLBACKS; i++) { + if (callbacks_[i].callback_ == callback && callbacks_[i].arg_ == argument) { + callbacks_[i].callback_ = NULL; + callbacks_[i].arg_ = NULL; rejectNum++; } } @@ -40,10 +35,10 @@ int JASCallbackMgr::reject(JASCallback* function, void* argument) { /* 802900C4-80290140 28AA04 007C+00 0/0 3/3 0/0 .text callback__14JASCallbackMgrFv */ void JASCallbackMgr::callback() { - for (int i = 0; i < 0x20; i++) { - if (mCallbacks[i].mFunction && mCallbacks[i].mFunction(mCallbacks[i].mArgument) < 0) { - mCallbacks[i].mFunction = NULL; - mCallbacks[i].mArgument = NULL; + for (int i = 0; i < NUM_CALLBACKS; i++) { + if (callbacks_[i].callback_ && callbacks_[i].callback_(callbacks_[i].arg_) < 0) { + callbacks_[i].callback_ = NULL; + callbacks_[i].arg_ = NULL; } } } |