mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-13 03:29:16 -04:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user