1 files changed, 17 insertions, 25 deletions

diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
index 03525f9199..ee91eb3e8a 100644
--- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -21,11 +21,11 @@ JASHeap* JASWaveArcLoader::getRootHeap() {
 char JASWaveArcLoader::sCurrentDir[DIR_MAX] = "/AudioRes/Waves/";
 
 void JASWaveArcLoader::setCurrentDir(char const* dir) {
-    ASSERT(std::strlen(dir) < DIR_MAX - 1);
+    JUT_ASSERT(40, std::strlen(dir) < DIR_MAX - 1);
     strcpy(sCurrentDir, dir);
     u32 len = strlen(sCurrentDir);
     if (sCurrentDir[len - 1] != '/') {
-        ASSERT(len + 1 < DIR_MAX);
+        JUT_ASSERT(45, len + 1 < DIR_MAX);
         sCurrentDir[len] = '/';
         sCurrentDir[len + 1] = '\0';
     }
@@ -77,10 +77,8 @@ bool JASWaveArc::eraseSetup() {
 void JASWaveArc::loadToAramCallback(void* this_) {
     loadToAramCallbackParams* tmp = (loadToAramCallbackParams*)this_;
     JASWaveArc* wavArc = tmp->mWavArc;
-    JKRAramBlock* block = JKRDvdAramRipper::loadToAram(tmp->mEntryNum, tmp->mBase,
-                                                       EXPAND_SWITCH_UNKNOWN0, 0, 0, NULL);
-    if (block == NULL) {
-        // "loadToAram Failed"
+    if (JKRDvdAramRipper::loadToAram(tmp->mEntryNum, tmp->mBase, EXPAND_SWITCH_UNKNOWN0, 0, 0, NULL) == NULL) {
+        JUT_WARN(129, "%s", "loadToAram Failed");
         return;
     }
     wavArc->_5a--;
@@ -93,19 +91,16 @@ bool JASWaveArc::sendLoadCmd() {
     JASMutexLock mutexLock(&mMutex);
     _48 = 0;
     mStatus = 1;
-    void* base = mHeap.getBase();
     loadToAramCallbackParams commandInfo;
     commandInfo.mWavArc = this;
     commandInfo.mEntryNum = mEntryNum;
-    commandInfo.mBase = (uintptr_t)mHeap.mBase;
+    commandInfo.mBase = (uintptr_t)mHeap.getBase();
     commandInfo._c = ++_58;
 
     _5a++;
 
-    JASTaskThread* thread = JASDvd::getThreadPointer();
-    int status = thread->sendCmdMsg(loadToAramCallback, &commandInfo, 0x10);
-    if (status == 0) {
-        // "sendCmdMsg loadToAramCallback Failed"
+    if (JASDvd::getThreadPointer()->sendCmdMsg(loadToAramCallback, &commandInfo, 0x10) == 0) {
+        JUT_WARN(193, "%s", "sendCmdMsg loadToAramCallback Failed");
         mHeap.free();
         return false;
     }
@@ -123,8 +118,7 @@ bool JASWaveArc::load(JASHeap* heap) {
     if (heap == NULL) {
         heap = JASWaveArcLoader::getRootHeap();
     }
-    bool result = mHeap.alloc(heap, mFileLength);
-    if (result == false) {
+    if (mHeap.alloc(heap, mFileLength) == false) {
         return false;
     }
     return sendLoadCmd();
@@ -141,8 +135,7 @@ bool JASWaveArc::loadTail(JASHeap* heap) {
     if (heap == NULL) {
         heap = JASWaveArcLoader::getRootHeap();
     }
-    bool result = mHeap.allocTail(heap, mFileLength);
-    if (result == false) {
+    if (mHeap.allocTail(heap, mFileLength) == false) {
         return false;
     }
     return sendLoadCmd();
@@ -163,8 +156,7 @@ void JASWaveArc::setEntryNum(s32 entryNum) {
     if (entryNum < 0) {
         return;
     }
-    BOOL openStatus = DVDFastOpen(entryNum, &fileInfo);
-    if (openStatus == FALSE) {
+    if (DVDFastOpen(entryNum, &fileInfo) == FALSE) {
         return;
     }
     mFileLength = fileInfo.length;
@@ -176,13 +168,13 @@ void JASWaveArc::setFileName(char const* fileName) {
     char* currentDir = JASWaveArcLoader::getCurrentDir();
     size_t length = strlen(currentDir);
     length = length + strlen(fileName);
-    JKRHeap* systemHeap = JASKernel::getSystemHeap();
-    char* fileString = new (systemHeap, -4) char[length + 1];
-    strcpy(fileString, currentDir);
-    strcat(fileString, fileName);
-    fileString[length] = '\0';
-    int entryNum = DVDConvertPathToEntrynum(fileString);
-    delete[] fileString;
+    char* path = new (JASKernel::getSystemHeap(), -4) char[length + 1];
+    JUT_ASSERT(322, path);
+    strcpy(path, currentDir);
+    strcat(path, fileName);
+    path[length] = '\0';
+    int entryNum = DVDConvertPathToEntrynum(path);
+    delete[] path;
     if (entryNum < 0) {
         return;
     }