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

1 files changed, 52 insertions, 44 deletions

diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/src/JSystem/JAudio2/JAIStreamMgr.cpp
index 3fedba540b..76c8ae4734 100644
--- a/src/JSystem/JAudio2/JAIStreamMgr.cpp
+++ b/src/JSystem/JAudio2/JAIStreamMgr.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAIStreamMgr
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAIStreamMgr.h"
@@ -11,115 +6,128 @@
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
 /* 802A3B68-802A3C3C 29E4A8 00D4+00 0/0 1/1 0/0 .text            __ct__12JAIStreamMgrFb */
-JAIStreamMgr::JAIStreamMgr(bool param_0) : JASGlobalInstance<JAIStreamMgr>(param_0) {
+JAIStreamMgr::JAIStreamMgr(bool setInstance) : JASGlobalInstance<JAIStreamMgr>(setInstance) {
     streamDataMgr_ = NULL;
     mStreamAramMgr = NULL;
     field_0x6c = NULL;
-    field_0x54 = NULL;
+    mAudience = NULL;
     mParams.init();
     mActivity.init();
 }
 
 /* 802A3C3C-802A3D70 29E57C 0134+00 0/0 1/1 0/0 .text
  * startSound__12JAIStreamMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
-bool JAIStreamMgr::startSound(JAISoundID param_1, JAISoundHandle* param_2,
-                              JGeometry::TVec3<f32> const* param_3) {
+bool JAIStreamMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
     JUT_ASSERT(37, streamDataMgr_);
-    if (param_2 != NULL && *param_2) {
-        (*param_2)->stop();
+    if (handle != NULL && *handle) {
+        (*handle)->stop();
     }
-    s32 streamFileEntry = streamDataMgr_->getStreamFileEntry(param_1);
+
+    s32 streamFileEntry = streamDataMgr_->getStreamFileEntry(id);
     if (streamFileEntry < 0) {
-        JUT_WARN(46, "Cannot find the stream file entry for ID:%08x\n", param_1.mId.mFullId)
+        JUT_WARN(46, "Cannot find the stream file entry for ID:%08x\n", id.id_.composite_)
         return false;
     } 
+
     JAIStream* stream = newStream_();
-    JAISoundInfo* piVar5 = JASGlobalInstance<JAISoundInfo>::getInstance();
-    int iVar2 = -1;
-    if (piVar5 != NULL) {
-        iVar2 = piVar5->getCategory(param_1);
+    JAISoundInfo* soundInfo = JASGlobalInstance<JAISoundInfo>::getInstance();
+
+    int category = -1;
+    if (soundInfo != NULL) {
+        category = soundInfo->getCategory(id);
     }
+
     if (stream == NULL) {
         return false;
     }
-    stream->JAIStreamMgr_startID_(param_1, streamFileEntry, param_3, field_0x54, iVar2);
-    if (piVar5 != NULL) {
-        piVar5->getStreamInfo(param_1, stream);
+
+    stream->JAIStreamMgr_startID_(id, streamFileEntry, posPtr, mAudience, category);
+    if (soundInfo != NULL) {
+        soundInfo->getStreamInfo(id, stream);
     }
-    if (param_2 != NULL) {
-        stream->attachHandle(param_2);
+
+    if (handle != NULL) {
+        stream->attachHandle(handle);
     }
+
     return false;
 }
 
 /* 802A3D70-802A3E68 29E6B0 00F8+00 1/1 0/0 0/0 .text            freeDeadStream___12JAIStreamMgrFv
  */
 void JAIStreamMgr::freeDeadStream_() {
-    JSULink<JAIStream>* link = mStreamList.getFirst();
-    while (link != NULL) {
-        JAIStream* stream = link->getObject();
-        JSULink<JAIStream>* next = link->getNext();
+    JSULink<JAIStream>* i = mStreamList.getFirst();
+    while (i != NULL) {
+        JAIStream* stream = i->getObject();
+        JSULink<JAIStream>* next = i->getNext();
         if (stream->status_.isDead()) {
-            mStreamList.remove(link);
+            mStreamList.remove(i);
             void* aramAddr = stream->JAIStreamMgr_getAramAddr_();
             if (aramAddr != NULL) {
-                mStreamAramMgr->deleteStreamAram((u32)aramAddr);
+                bool result = mStreamAramMgr->deleteStreamAram((u32)aramAddr);
+                JUT_ASSERT(105, result);
             }
             
             delete stream;
         }
-        link = next;
+        i = next;
     }
 }
 
 /* 802A3EBC-802A4028 29E7FC 016C+00 0/0 1/1 0/0 .text            calc__12JAIStreamMgrFv */
 void JAIStreamMgr::calc() {
+    JSULink<JAIStream>* i;
     mParams.calc();
-    for (JSULink<JAIStream>* link = mStreamList.getFirst(); link != NULL; link = link->getNext()) {
-        link->getObject()->JAIStreamMgr_calc_();
+    for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
+        i->getObject()->JAIStreamMgr_calc_();
     }
     freeDeadStream_();
 }
 
 /* 802A4028-802A4068 29E968 0040+00 0/0 1/1 0/0 .text            stop__12JAIStreamMgrFv */
 void JAIStreamMgr::stop() {
-    for (JSULink<JAIStream>* link = mStreamList.getFirst(); link != NULL; link = link->getNext()) {
-        link->getObject()->stop();
+    JSULink<JAIStream>* i;
+    for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
+        i->getObject()->stop();
     }
 }
 
 /* 802A4068-802A40B8 29E9A8 0050+00 0/0 2/2 0/0 .text            stop__12JAIStreamMgrFUl */
-void JAIStreamMgr::stop(u32 param_0) {
-    for (JSULink<JAIStream>* link = mStreamList.getFirst(); link != NULL; link = link->getNext()) {
-        link->getObject()->stop(param_0);
+void JAIStreamMgr::stop(u32 fadeTime) {
+    JSULink<JAIStream>* i;
+    for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
+        i->getObject()->stop(fadeTime);
     }
 }
 
 /* 802A40B8-802A4118 29E9F8 0060+00 0/0 1/1 0/0 .text stopSoundID__12JAIStreamMgrF10JAISoundID */
-void JAIStreamMgr::stopSoundID(JAISoundID param_0) {
-    for (JSULink<JAIStream>* link = mStreamList.getFirst(); link != NULL; link = link->getNext()) {
-        if ((u32)link->getObject()->getID() == (u32)param_0) {
-            link->getObject()->stop();
+void JAIStreamMgr::stopSoundID(JAISoundID id) {
+    JSULink<JAIStream>* i;
+    for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
+        if ((u32)i->getObject()->getID() == (u32)id) {
+            i->getObject()->stop();
         }
     }
 }
 
 /* 802A4118-802A4174 29EA58 005C+00 0/0 1/1 0/0 .text            mixOut__12JAIStreamMgrFv */
 void JAIStreamMgr::mixOut() {
-     for (JSULink<JAIStream>* link = mStreamList.getFirst(); link != NULL; link = link->getNext()) {
-        link->getObject()->JAIStreamMgr_mixOut_(mParams.mParams, mActivity);
+    JSULink<JAIStream>* i;
+     for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
+        i->getObject()->JAIStreamMgr_mixOut_(mParams.params_, mActivity);
     }
 }
 
 /* 802A4174-802A4244 29EAB4 00D0+00 1/1 0/0 0/0 .text            newStream___12JAIStreamMgrFv */
 JAIStream* JAIStreamMgr::newStream_() {
     if (mStreamAramMgr == NULL) {
-        JUT_WARN(229, "JAIStreamAramMgr must be set.\n");
+        JUT_WARN(229, "%s", "JAIStreamAramMgr must be set.\n");
         return NULL;
     } 
+
     JAIStream* stream = new JAIStream(this, field_0x6c);
     if (stream == NULL) {
-        JUT_WARN(235, "JASPoolAllocObject::<JAIStream>::operator new failed .\n");
+        JUT_WARN(235, "%s", "JASPoolAllocObject::<JAIStream>::operator new failed .\n");
         return NULL;
     }