JASWaveArcLoader

include/JSystem/JAudio/JASDvdThread.h

@@ -19,7 +19,7 @@ public:
         OSInitThreadQueue(&field_0x68);
     }
     ~JASTaskThread();
-    bool sendCmdMsg(s32 (*)(void*), void*, u32);
+    BOOL sendCmdMsg(s32 (*)(void*), void*, u32);
     void* run();
     void pause(bool);
 
@@ -31,7 +31,7 @@ namespace JASystem {
     namespace Dvd {
         bool createThread(int, int, u32);
         void resumeThread();
-        void sendCmdMsg(s32 (*)(void*), void*, u32);
+        BOOL sendCmdMsg(s32 (*)(void*), void*, u32);
         int checkPassDvdT(u32, u32*, void (*)(u32));
         u32 checkFile(char*);
         void unpauseDvdT();

include/JSystem/JAudio/JASHeapCtrl.h

@@ -19,6 +19,7 @@ namespace JASystem {
             };
 
             THeap(TDisposer*);
+            ~THeap() {}
             void initRootHeap(void*, u32, Type);
             bool alloc(THeap*, u32);
             bool free();
@@ -42,9 +43,9 @@ namespace JASystem {
         public:
             TSolidHeap();
             ~TSolidHeap() {}
-            int alloc(long param_1);
+            void* alloc(s32 param_1);
             void freeAll();
-            void init(u8* param_1, long param_2);
+            void init(u8* param_1, s32 param_2);
             int getRemain();
 
             /* 0x00 */ u32 field_0x0;

include/JSystem/JAudio/JASSystemHeap.h

@@ -14,7 +14,7 @@ namespace JASystem {
         void sysDramSetup(JKRSolidHeap*);
         void* allocFromSysDram(u32);
         void sysAramSetup(u32);
-        void allocFromSysAramFull(u32*);
+        void* allocFromSysAramFull(u32*);
 
         extern TSolidHeap audioAramHeap;
         extern u32 audioDramSize;

include/JSystem/JAudio/JASWaveArcLoader.h

@@ -0,0 +1,43 @@
+#ifndef JASWAVEARCLOADER_H
+#define JASWAVEARCLOADER_H
+
+#include "JSystem/JAudio/JASHeapCtrl.h"
+#include "dolphin/os/OSMutex.h"
+
+namespace JASystem {
+    namespace WaveArcLoader {
+        bool init();
+        Kernel::THeap* getRootHeap();
+        void setCurrentDir(const char*);
+        char* getCurrentDir();
+
+        extern Kernel::THeap sAramHeap;
+        extern char sCurrentDir[];
+    };
+
+    class TWaveArc : public Kernel::TDisposer {
+    public:
+        TWaveArc();
+        virtual void onLoadDone() {}
+        virtual void onEraseDone() {}
+        bool loadSetup(u32);
+        bool eraseSetup();
+        static s32 loadToAramCallback(void*);
+        bool sendLoadCmd();
+        void load(Kernel::THeap*);
+        bool erase();
+        void onDispose();
+        void setEntryNum(s32);
+        void setFileName(const char*);
+
+        /* 0x04 */ Kernel::THeap field_0x4;
+        /* 0x4C */ int field_0x4c;
+        /* 0x50 */ OSMutex mMutex;
+        /* 0x68 */ int field_0x68;
+        /* 0x6C */ int field_0x6c;
+        /* 0x70 */ int field_0x70;
+        /* 0x74 */ int field_0x74;
+    };
+}
+
+#endif /* JASWAVEARCLOADER_H */

include/JSystem/JKernel/JKRThread.h

@@ -31,11 +31,11 @@ public:
 
 protected:
     void resume() { OSResumeThread(mThreadRecord); }
-    void sendMessage(OSMessage message) {
-        OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NOBLOCK);
+    BOOL sendMessage(OSMessage message) {
+        return OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NOBLOCK);
     }
-    void sendMessageBlock(OSMessage message) {
-        OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK);
+    BOOL sendMessageBlock(OSMessage message) {
+        return OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK);
     }
     OSMessage waitMessage() {
         OSMessage message;