Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2

include/JSystem/JAudio2/JAISeMgr.h

@@ -15,7 +15,7 @@ struct JASNonCopyable {
     JASNonCopyable() {}
     ~JASNonCopyable() {}
 
-    /* 0x0 */ int field_0x0;
+    /* 0x0 */ void* field_0x0;
 };  // Size: 0x4
 
 /**
@@ -56,7 +56,7 @@ public:
         mParams.init();
         mMaxActiveSe = 0;
         mMaxInactiveSe = 0;
-        field_0x0 = 0;
+        field_0x0 = NULL;
     }
 
     virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);

include/JSystem/JAudio2/JAISeq.h

@@ -6,7 +6,7 @@
 #include "JSystem/JSupport/JSUList.h"
 
 class JAISeqMgr;
-class JAISoundChild;
+struct JAISoundChild;
 
 /**
  * @ingroup jsystem-jaudio

include/JSystem/JAudio2/JAISound.h

@@ -5,6 +5,7 @@
 #include "JSystem/JAudio2/JAIAudible.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "global.h"
+#include <cstdint>
 
 class JAISound;
 
@@ -134,7 +135,7 @@ struct JAISoundStatus_ {
             u8 flag8 : 1;
         } flags;
     } state;
-    /* 0x4 */ u32 userdata_;
+    /* 0x4 */ uintptr_t userdata_;
 };  // Size: 0x8
 
 /**
@@ -253,7 +254,7 @@ class JAIAudible;
 struct JAIAudience;
 class JAISe;
 class JAISeq;
-class JAISoundChild;
+struct JAISoundChild;
 class JAIStream;
 class JAITempoMgr;
 
@@ -294,8 +295,8 @@ public:
     void setAnimationState(u32 state) {
         status_.state.flags.animationState = state;
     }
-    u32 getUserData() const { return status_.userdata_; }
-    void setUserData(u32 userData) { status_.userdata_ = userData; }
+    uintptr_t getUserData() const { return status_.userdata_; }
+    void setUserData(uintptr_t userData) { status_.userdata_ = userData; }
     JAIAudible* getAudible() { return audible_; }
     bool isHandleAttached() const { return handle_ != NULL; }
     bool hasLifeTime() const { return status_.field_0x1.flags.flag2; }

include/JSystem/JAudio2/JASCalc.h

@@ -2,10 +2,11 @@
 #define JASCALC_H
 
 #include <dolphin/types.h>
+#include <limits>
 
 /**
  * @ingroup jsystem-jaudio
- * 
+ *
  */
 struct JASCalc {
     static void imixcopy(const s16*, const s16*, s16*, u32);
@@ -15,15 +16,8 @@ struct JASCalc {
     static void bzero(void* dest, u32 size);
     static f32 pow2(f32);
 
-    // Could not make it work as inline - specialization is in JASCalc.cpp
     template <typename A, typename B>
-    static A clamp(B x); /* {
-        if (std::numeric_limits<A>::min() >= x)
-            return std::numeric_limits<A>::min();
-        if (x >= std::numeric_limits<A>::max())
-            return std::numeric_limits<A>::max();
-        return x;
-    } */
+    static A clamp(B x);
 
     static f32 clamp01(f32 i_value) {
         if (i_value <= 0.0f) {
@@ -42,4 +36,13 @@ struct JASCalc {
     static const s16 CUTOFF_TO_IIR_TABLE[128][4];
 };
 
+template <typename A, typename B>
+A JASCalc::clamp(B x) {
+    if (x <= std::numeric_limits<A>::min())
+        return std::numeric_limits<A>::min();
+    if (x >= std::numeric_limits<A>::max())
+        return std::numeric_limits<A>::max();
+    return x;
+}
+
 #endif /* JASCALC_H */

include/JSystem/JAudio2/JASChannel.h

@@ -8,7 +8,7 @@
 #include "JSystem/JAudio2/JASWaveInfo.h"
 #include <dolphin/os.h>
 
-class JASDSPChannel;
+struct JASDSPChannel;
 
 namespace JASDsp {
     struct TChannel;

include/JSystem/JAudio2/JASDSPInterface.h

@@ -112,7 +112,7 @@ namespace JASDsp {
     void invalChannelAll();
     void initBuffer();
     int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
-    BOOL changeFXLineParam(u8, u8, u32);
+    BOOL changeFXLineParam(u8, u8, uintptr_t);
 
     extern u8 const DSPADPCM_FILTER[64];
     extern u32 const DSPRES_FILTER[320];

include/JSystem/JAudio2/JASGadget.h

@@ -2,8 +2,15 @@
 #define JASGADGET_H
 
 #include "JSystem/JUtility/JUTAssert.h"
+#include <cstring>
 #include <string>
 
+#ifdef __MWERKS__
+#define JAS_GLOBAL_INSTANCE_INIT
+#else
+#define JAS_GLOBAL_INSTANCE_INIT {}
+#endif
+
 /**
  * @ingroup jsystem-jaudio
  * 

include/JSystem/JAudio2/JASHeapCtrl.h

@@ -265,13 +265,13 @@ namespace JASKernel {
     void setupRootHeap(JKRSolidHeap*, u32);
     JKRHeap* getSystemHeap();
     JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
-    void setupAramHeap(u32, u32);
+    void setupAramHeap(uintptr_t, u32);
     JASHeap* getAramHeap();
     u32 getAramFreeSize();
     u32 getAramSize();
 
     extern JASHeap audioAramHeap;
-    extern u32 sAramBase;
+    extern uintptr_t sAramBase;
     extern JKRHeap* sSystemHeap;
     extern JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* sCommandHeap;
 };

include/JSystem/JAudio2/JASResArcLoader.h

@@ -8,10 +8,10 @@ namespace JASResArcLoader {
     size_t getResSize(JKRArchive const*, u16);
     size_t getResMaxSize(JKRArchive const*);
     static void loadResourceCallback(void*);
-    int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
+    int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, uintptr_t), uintptr_t);
 
     // from pikmin2
-    typedef void (*LoadCallback)(u32, u32);
+    typedef void (*LoadCallback)(u32, uintptr_t);
 
     struct TLoadResInfo {
         inline TLoadResInfo(JKRArchive* archive, u16 id, void* buf, u32 size)
@@ -30,7 +30,7 @@ namespace JASResArcLoader {
         void* mBuffer;          // _08
         u32 mBufferSize;        // _0C
         LoadCallback mCallback; // _10
-        u32 mCallbackArg;       // _14, arg to pass to mCallback along with readResource result
+        uintptr_t mCallbackArg; // _14, arg to pass to mCallback along with readResource result
         OSMessageQueue* mQueue; // _18
     };
 };

include/JSystem/JAudio2/JASWSParser.h

@@ -5,8 +5,8 @@
 
 class JKRHeap;
 class JASWaveBank;
-class JASBasicWaveBank;
-class JASSimpleWaveBank;
+struct JASBasicWaveBank;
+struct JASSimpleWaveBank;
 
 /**
  * @ingroup jsystem-jaudio

include/JSystem/JAudio2/JAUAudience.h

@@ -0,0 +1,6 @@
+#ifndef JAUAUDIENCE_H
+#define JAUAUDIENCE_H
+
+// NONMATCHING
+
+#endif /* JAUAUDIENCE_H */

include/JSystem/JAudio2/JAUSoundObject.h

@@ -0,0 +1,6 @@
+#ifndef JAUSOUNDOBJECT_H
+#define JAUSOUNDOBJECT_H
+
+// NONMATCHING
+
+#endif /* JAUSOUNDOBJECT_H */