d_a_e_fz work, doxygen revamp (#2127)

* initial freezard actor struct + setActionMode OK

* daE_FZ_Draw

* setReflectAngle

* mBoundSoundset

* daE_FZ_Execute & execute

* demoDelete

* daE_FZ_Delete & _delete

* CreateHeap

* useHeapInit

* cc_set

* mtx_set

* action WIP

* way_gake_check

* executeRollMove

* executeMove

* draw WIP

* executeDamage

* checkpoint

* create

* checkpoint

* daE_FZ_c::executeWait

* checkpoint

* daE_FZ_c::damage_check almost done

* rm asm

* rm headers

* setup_profile WIP + doxygen update

* fix merge issues

* docs fix?

* fix2

* doxygen updates

* setup g_profile_E_FZ, profile setup script WIP

* update github actions

* update progress.md
This commit is contained in:
Pheenoh
2024-04-12 00:10:30 -06:00
committed by GitHub
parent b36f0f9366
commit a61e3491f7
1245 changed files with 16183 additions and 9396 deletions
+4
View File
@@ -5,6 +5,10 @@
struct JASSoundParams;
/**
* @ingroup jsystem-jaudio
*
*/
class JAIAudible {
public:
virtual ~JAIAudible();
+4
View File
@@ -7,6 +7,10 @@ class JAIAudible;
class JAISoundID;
struct JASSoundParams;
/**
* @ingroup jsystem-jaudio
*
*/
struct JAIAudience {
virtual ~JAIAudience();
virtual JAIAudible* newAudible(JGeometry::TVec3<f32> const&, JAISoundID,
+4 -1
View File
@@ -3,10 +3,13 @@
#include "JSystem/JAudio2/JAISeqDataMgr.h"
#include "JSystem/JAudio2/JASTrack.h"
#include "JSystem/JSupport/JSUList.h"
class JAISeMgr;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISe : public JSULink<JAISe>, public JAISound {
public:
class TInner {
+20 -2
View File
@@ -2,28 +2,42 @@
#define JAISEMGR_H
#include "JSystem/JAudio2/JAISe.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JSupport/JSUList.h"
#include "global.h"
struct JAIAudience;
struct JASSoundParams;
/**
* @ingroup jsystem-jaudio
*
*/
struct JASNonCopyable {
/* 0x0 */ int field_0x0;
}; // Size: 0x4
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeCategoryArrangementItem {
u8 mMaxActiveSe;
u8 mMaxInactiveSe;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeCategoryArrangement {
JAISeCategoryArrangementItem mItems[16];
};
class JAISeMgr;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISeCategoryMgr : public JAISeqDataUser {
public:
/* 8029F9C4 */ void JAISeMgr_calc_();
@@ -59,6 +73,10 @@ public:
/* 0x68 */ int mMaxActiveSe;
}; // Size: 0x6C
/**
* @ingroup jsystem-jaudio
*
*/
class JAISeMgr : public JASGlobalInstance<JAISeMgr>,
public JAISeqDataUser,
public JAISoundActivity {
+4 -1
View File
@@ -2,13 +2,16 @@
#define JAISEQ_H
#include "JSystem/JAudio2/JAISeqDataMgr.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JAudio2/JASTrack.h"
#include "JSystem/JSupport/JSUList.h"
class JAISeqMgr;
class JAISoundChild;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISeq : public JASPoolAllocObject<JAISeq>, public JAISound, public JSULink<JAISeq> {
public:
class TInner {
+16 -1
View File
@@ -3,6 +3,10 @@
#include "JSystem/JAudio2/JAISound.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeqData {
JAISeqData(void* param_0, u32 param_1) {
field_0x0 = param_0;
@@ -18,6 +22,10 @@ struct JAISeqData {
/* 0x04 */ u32 field_0x4;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeqDataRegion {
bool intersects(JAISeqData& seqData) const {
if ((u32)addr + size < (u32)seqData.field_0x0) {
@@ -33,13 +41,20 @@ struct JAISeqDataRegion {
/* 0x04 */ u32 size;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeqDataUser {
virtual ~JAISeqDataUser();
virtual bool isUsingSeqData(JAISeqDataRegion const&) = 0;
virtual int releaseSeqData(JAISeqDataRegion const&) = 0;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISeqDataMgr {
enum SeqDataReturnValue{ SeqDataReturnValue_0 = 0, SeqDataReturnValue_1 = 1, SeqDataReturnValue_2 = 2};
virtual ~JAISeqDataMgr();
+4 -1
View File
@@ -4,11 +4,14 @@
#include "JSystem/JAudio2/JAISeqDataMgr.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JSupport/JSUList.h"
#include "JSystem/JUtility/JUTAssert.h"
struct JAIAudience;
class JAISeq;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISeqMgr : public JASGlobalInstance<JAISeqMgr>, public JAISeqDataUser {
public:
enum ReleaseSeqResult {
+34
View File
@@ -5,6 +5,10 @@
#include "JSystem/JAudio2/JAIAudible.h"
#include "global.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JAISoundID {
public:
operator u32() const { return this->mId.mFullId; }
@@ -36,6 +40,10 @@ public:
class JASTrack;
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundStatus_ {
/* 802A2220 */ s32 lockWhenPrepared();
/* 802A2244 */ s32 unlockIfLocked();
@@ -99,6 +107,10 @@ struct JAISoundStatus_ {
/* 0x4 */ u32 user_data;
}; // Size: 0x8
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundFader {
void forceIn() {
mIntensity = 1.0f;
@@ -135,6 +147,11 @@ struct JAISoundFader {
/* 0x00 */ f32 mIntensity;
/* 0x04 */ JAISoundParamsTransition::TTransition mTransition;
}; // Size: 0x10
/**
* @ingroup jsystem-jaudio
*
*/
template <typename A0>
struct JAISoundStrategyMgr__unknown {
virtual void virtual2();
@@ -142,6 +159,10 @@ struct JAISoundStrategyMgr__unknown {
virtual void virtual4(A0*, const JASSoundParams&);
};
/**
* @ingroup jsystem-jaudio
*
*/
template <typename A0>
struct JAISoundStrategyMgr {
virtual void virtual2();
@@ -155,6 +176,10 @@ struct JAISoundStrategyMgr__template1 {};
/* JAISoundStrategyMgr<JAIStream> */
struct JAISoundStrategyMgr__template2 {};
/**
* @ingroup jsystem-jaudio
*
*/
class JAISoundActivity {
public:
void init() { field_0x0.value = 0; }
@@ -174,6 +199,10 @@ public:
} field_0x0;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAITempoMgr {
public:
/* 0x00 */ f32 mTempo;
@@ -197,6 +226,11 @@ class JAISeq;
class JAISoundChild;
class JAIStream;
class JAITempoMgr;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISound {
public:
/* 802A21A0 */ void releaseHandle();
+4
View File
@@ -5,6 +5,10 @@
struct JASTrack;
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundChild {
/* 802A2AB0 */ void init();
/* 802A2B28 */ void mixOut(JASTrack*);
@@ -7,6 +7,10 @@
class JAISound;
class JAISoundID;
/**
* @ingroup jsystem-jaudio
*
*/
class JAISoundHandle {
public:
JAISoundHandle() {sound_ = NULL;};
@@ -28,6 +32,10 @@ public:
JAISound* sound_; // member from assert in operator->()
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAISoundHandles {
public:
JAISoundHandles(JAISoundHandle* pHandle, int param_1) {
+4
View File
@@ -4,6 +4,10 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundInfo : public JASGlobalInstance<JAISoundInfo> {
/* 802A2D34 */ JAISoundInfo(bool);
virtual int getSoundType(JAISoundID) const = 0;
+16
View File
@@ -3,6 +3,10 @@
#include "JSystem/JAudio2/JASSoundParams.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundParamsProperty {
void init() {
field_0x0 = 1.0f;
@@ -15,6 +19,10 @@ struct JAISoundParamsProperty {
/* 0x08 */ f32 field_0x8;
}; // Size: 0xC
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundParamsTransition {
struct TTransition {
void zero() {
@@ -70,6 +78,10 @@ struct JAISoundParamsTransition {
/* 0x30 */ TTransition mDolby;
}; // Size: 0x3C
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundParamsMove {
JAISoundParamsMove() : mParams() {}
@@ -90,6 +102,10 @@ struct JAISoundParamsMove {
/* 0x14 */ JAISoundParamsTransition mTransition;
}; // Size: 0x50
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundParams {
JAISoundParams() : mMove() {}
void mixOutAll(JASSoundParams const&, JASSoundParams*, f32);
@@ -4,6 +4,10 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAISoundStarter : public JASGlobalInstance<JAISoundStarter> {
/* 802A2F6C */ JAISoundStarter(bool);
+4 -1
View File
@@ -3,11 +3,14 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASAramStream.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JSupport/JSUList.h"
class JAIStreamMgr;
/**
* @ingroup jsystem-jaudio
*
*/
class JAIStream : public JASPoolAllocObject<JAIStream>, public JAISound, public JSULink<JAIStream> {
public:
struct TInner {
@@ -3,11 +3,19 @@
#include "JSystem/JAudio2/JAISound.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAIStreamDataMgr {
virtual s32 getStreamFileEntry(JAISoundID) = 0;
virtual ~JAIStreamDataMgr();
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAIStreamAramMgr {
virtual void* newStreamAram(u32*) = 0;
virtual void deleteStreamAram(u32) = 0;
+4 -2
View File
@@ -1,15 +1,17 @@
#ifndef JAISTREAMMGR_H
#define JAISTREAMMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JAIStream.h"
#include "JSystem/JSupport/JSUList.h"
#include "JSystem/JUtility/JUTAssert.h"
class JAIStreamAramMgr;
class JAIStreamDataMgr;
/**
* @ingroup jsystem-jaudio
*
*/
class JAIStreamMgr : public JASGlobalInstance<JAIStreamMgr> {
public:
/* 802A3B68 */ JAIStreamMgr(bool);
+4 -1
View File
@@ -2,7 +2,6 @@
#define JASARAMSTREAM_H
#include "JSystem/JAudio2/JASTaskThread.h"
#include "dolphin/os/OSMessage.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/dvd.h"
@@ -14,6 +13,10 @@ namespace JASDsp {
#define CHANNEL_MAX 6
/**
* @ingroup jsystem-jaudio
*
*/
class JASAramStream {
public:
typedef void (*StreamCallback)(u32, JASAramStream*, void*);
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASAudioReseter {
/* 8029D0B4 */ JASAudioReseter();
/* 8029D0FC */ ~JASAudioReseter();
+4
View File
@@ -10,6 +10,10 @@ enum JASAudioMessage {
AUDIOMSG_STOP = 2,
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASAudioThread : public JKRThread, public JASGlobalInstance<JASAudioThread> {
/* 8029CCDC */ JASAudioThread(int, int, u32);
/* 8029CD4C */ static void create(s32);
+4
View File
@@ -11,6 +11,10 @@ namespace JASDsp {
class TChannel;
}
/**
* @ingroup jsystem-jaudio
*
*/
class JASBank {
public:
JASBank() { mWaveBank = NULL; }
+4
View File
@@ -5,6 +5,10 @@
class JASBank;
/**
* @ingroup jsystem-jaudio
*
*/
class JASBankList {
public:
virtual JASBank* getBank(u32 param_0) const = 0;
+8
View File
@@ -4,6 +4,10 @@
#include "JSystem/JAudio2/JASBankList.h"
#include "JSystem/JAudio2/JASGadget.h"
/**
* @ingroup jsystem-jaudio
*
*/
template<size_t N>
class JASBankTable : public JASBankList {
public:
@@ -15,6 +19,10 @@ private:
JASPtrArray<JASBank, N> mArray;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JASDefaultBankTable : public JASBankTable<256>, public JASGlobalInstance<JASDefaultBankTable> {
public:
JASDefaultBankTable() : JASGlobalInstance(true) {}
+13
View File
@@ -5,6 +5,11 @@
#include "JSystem/JAudio2/JASSoundParams.h"
struct JKRHeap;
/**
* @ingroup jsystem-jaudio
*
*/
struct JASInstParam : public JASSoundParams {
JASInstParam() {
field_0x14 = NULL;
@@ -23,12 +28,20 @@ struct JASInstParam : public JASSoundParams {
u8 field_0x1e;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASInst {
virtual ~JASInst() {}
virtual bool getParam(int, int, JASInstParam*) const = 0;
virtual u32 getType() const = 0;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASBasicInst : public JASInst {
struct TKeymap {
/* 80298250 */ ~TKeymap();
+12 -1
View File
@@ -3,8 +3,11 @@
#include "JSystem/JAudio2/JASWaveArcLoader.h"
#include "JSystem/JAudio2/JASWaveInfo.h"
#include "dolphin/os/OSMutex.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASWaveHandle {
public:
/* virtual */ ~JASWaveHandle() {};
@@ -14,6 +17,10 @@ public:
void* vtable;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JASWaveBank {
public:
/* 80298B88 */ /* virtual */ ~JASWaveBank() {};
@@ -24,6 +31,10 @@ public:
void* vtable;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASBasicWaveBank : public JASWaveBank {
struct TWaveHandle : public JASWaveHandle {
/* 802985E4 */ ~TWaveHandle();
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASCalc {
/* 8028F2E8 */ static void imixcopy(s16 const*, s16 const*, s16*, u32);
/* 8028F318 */ static void bcopyfast(void const*, void*, u32);
+4
View File
@@ -5,6 +5,10 @@
typedef long JASCallback(void*);
/**
* @ingroup jsystem-jaudio
*
*/
struct JASCallbackMgr {
struct TCallback {
TCallback()
+8
View File
@@ -14,6 +14,10 @@ namespace JASDsp {
struct TChannel;
}
/**
* @ingroup jsystem-jaudio
*
*/
class JASChannelParams {
public:
JASChannelParams() {
@@ -41,6 +45,10 @@ public:
/* 0x14 */ f32 mDolby;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JASChannel : public JASPoolAllocObject_MultiThreaded<JASChannel> {
public:
typedef void (*Callback)(u32, JASChannel*, JASDsp::TChannel*, void*);
+8 -1
View File
@@ -1,11 +1,14 @@
#ifndef JASCMDSTACK_H
#define JASCMDSTACK_H
#include "dolphin/types.h"
#include "JSystem/JSupport/JSUList.h"
class JASTrack;
/**
* @ingroup jsystem-jaudio
*
*/
struct JASPortArgs {
JASTrack* _00;
u32 _04;
@@ -20,6 +23,10 @@ struct JASPortArgs {
f32 _28;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASPortCmd : JSULink<JASPortCmd> {
typedef void (*Command)(JASPortArgs*);
@@ -3,6 +3,10 @@
#include "dolphin/os/OSInterrupt.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASCriticalSection {
public:
JASCriticalSection() { mInterruptState = OSDisableInterrupts(); };
+4
View File
@@ -3,6 +3,10 @@
#include "JSystem/JAudio2/JASDSPInterface.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASDSPChannel {
typedef s32 (*Callback)(u32, JASDsp::TChannel*, void*);
+4
View File
@@ -5,6 +5,10 @@
struct JKRHeap;
/**
* @ingroup jsystem-jaudio
*
*/
struct JASDrumSet : public JASInst {
struct TPerc {
/* 802984C4 */ TPerc();
+4
View File
@@ -5,6 +5,10 @@
class JASTaskThread;
/**
* @ingroup jsystem-jaudio
*
*/
class JASDvd {
public:
/* 8028FEFC */ static JASTaskThread* getThreadPointer();
+12
View File
@@ -4,6 +4,10 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "string.h"
/**
* @ingroup jsystem-jaudio
*
*/
template<class T>
class JASGlobalInstance {
public:
@@ -29,6 +33,10 @@ public:
static T* sInstance;
};
/**
* @ingroup jsystem-jaudio
*
*/
template<class T>
class JASPtrTable {
public:
@@ -59,6 +67,10 @@ private:
/* 0x04 */ u32 mSize;
};
/**
* @ingroup jsystem-jaudio
*
*/
template<class T, size_t N>
class JASPtrArray : public JASPtrTable<T> {
public:
+28
View File
@@ -9,6 +9,10 @@ class JASDisposer;
class JKRHeap;
class JKRSolidHeap;
/**
* @ingroup jsystem-jaudio
*
*/
class JASHeap {
public:
/* 80290140 */ JASHeap(JASDisposer* param_0 = NULL);
@@ -33,6 +37,10 @@ public:
/* 0x40 */ JASHeap* field_0x40;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASGenericMemPool {
/* 80290848 */ JASGenericMemPool();
/* 80290860 */ ~JASGenericMemPool();
@@ -77,6 +85,10 @@ namespace JASThreadingModel {
};
};
/**
* @ingroup jsystem-jaudio
*
*/
template <typename T>
class JASMemPool : public JASGenericMemPool {
public:
@@ -85,6 +97,10 @@ public:
void free(void* ptr, u32 n) { JASGenericMemPool::free(ptr, n); }
};
/**
* @ingroup jsystem-jaudio
*
*/
template<u32 ChunkSize, typename T>
class JASMemChunkPool {
struct MemoryChunk {
@@ -207,6 +223,10 @@ namespace JASKernel {
extern JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* sCommandHeap;
};
/**
* @ingroup jsystem-jaudio
*
*/
template <typename T>
class JASPoolAllocObject {
public:
@@ -233,6 +253,10 @@ private:
}
};
/**
* @ingroup jsystem-jaudio
*
*/
template <typename T>
class JASMemPool_MultiThreaded : public JASGenericMemPool {
public:
@@ -252,6 +276,10 @@ public:
}
};
/**
* @ingroup jsystem-jaudio
*
*/
template <typename T>
class JASPoolAllocObject_MultiThreaded {
public:
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASLfo {
/* 8029BD14 */ JASLfo();
/* 8029BD44 */ f32 getValue() const;
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/os/OSMutex.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASMutexLock {
JASMutexLock(OSMutex* mutex) {
mMutex = mutex;
+4 -1
View File
@@ -3,7 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASOscillator {
struct Point {
/* 0x0 */ s16 _0;
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASProbe {
/* 80290EE4 */ static void start(s32, char const*);
/* 80290D74 */ void start(char const*);
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASRegisterParam {
public:
enum RegID {
-1
View File
@@ -1,7 +1,6 @@
#ifndef JASREPORT_H
#define JASREPORT_H
void JASReport(const char* message, ...);
#endif /* JASREPORT_H */
+4
View File
@@ -6,6 +6,10 @@
class JASTrack;
class JASSeqParser;
/**
* @ingroup jsystem-jaudio
*
*/
class JASSeqCtrl {
public:
enum IntrType {
+4
View File
@@ -5,6 +5,10 @@
class JASTrack;
/**
* @ingroup jsystem-jaudio
*
*/
class JASSeqParser {
public:
enum BranchCondition {};
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASSeqReader {
public:
/* 80296108 */ void init();
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASSoundParams {
/* 8029E3B0 */ void clamp();
/* 8029E47C */ void combine(JASSoundParams const&, JASSoundParams const&);
+4
View File
@@ -4,6 +4,10 @@
#include "JSystem/JKernel/JKRThread.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASTaskThread : public JKRThread {
private:
struct JASThreadCallStack {
+4 -3
View File
@@ -3,9 +3,6 @@
#include "JSystem/JAudio2/JASBankTable.h"
#include "JSystem/JAudio2/JASChannel.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JAudio2/JASOscillator.h"
#include "JSystem/JAudio2/JASRegisterParam.h"
#include "JSystem/JAudio2/JASSeqCtrl.h"
#include "JSystem/JAudio2/JASTrackPort.h"
@@ -19,6 +16,10 @@ namespace JASDsp {
extern u32 FILTER_MODE_IIR;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
enum Status {
STATUS_FREE,
+4
View File
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASTrackPort {
public:
/* 8029354C */ void init();
+4
View File
@@ -4,6 +4,10 @@
#include "JSystem/JAudio2/JASBank.h"
#include "JSystem/JAudio2/JASOscillator.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JASVoiceBank : public JASBank {
public:
/* 80297F74 */ virtual bool getInstParam(int, int, int, JASInstParam*) const;
+4 -1
View File
@@ -2,13 +2,16 @@
#define JASWSPARSER_H
#include "dolphin/types.h"
#include "JSystem/JSupport/JSupport.h"
class JKRHeap;
class JASWaveBank;
class JASBasicWaveBank;
class JASSimpleWaveBank;
/**
* @ingroup jsystem-jaudio
*
*/
class JASWSParser {
public:
template<class T>
+13 -1
View File
@@ -2,13 +2,16 @@
#define JASWAVEARCLOADER_H
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JSupport/JSUList.h"
#include "dol2asm.h"
#include "dolphin/os/OSMutex.h"
class JKRHeap;
class JKRSolidHeap;
/**
* @ingroup jsystem-jaudio
*
*/
struct JASDisposer {
JASDisposer() {}
/* 8029A7B8 */ virtual ~JASDisposer() {}
@@ -16,6 +19,11 @@ struct JASDisposer {
};
#define DIR_MAX 64
/**
* @ingroup jsystem-jaudio
*
*/
struct JASWaveArcLoader {
/* 8029A0A0 */ static JASHeap* getRootHeap();
/* 8029A0D0 */ static void setCurrentDir(char const*);
@@ -25,6 +33,10 @@ struct JASWaveArcLoader {
static JASHeap* sAramHeap;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JASWaveArc : JASDisposer {
/* 8029A13C */ JASWaveArc();
/* 8029A258 */ bool loadSetup(u32);
+4 -2
View File
@@ -1,8 +1,10 @@
#ifndef JASWAVEINFO_H
#define JASWAVEINFO_H
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JASWaveInfo {
JASWaveInfo() {
field_0x01 = 0x3c;
+4 -2
View File
@@ -1,8 +1,10 @@
#ifndef JAUAUDIBLEPARAM_H
#define JAUAUDIBLEPARAM_H
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUAudibleParam {
f32 getDopplerPower() const {
return (u32)((*(u8*)&field_0x0.raw >> 4) & 0xf) * (1.0f / 15.0f);
@@ -3,6 +3,10 @@
#include "dolphin/types.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JAUAudioArcInterpreter {
public:
/* 802A4244 */ JAUAudioArcInterpreter();
@@ -5,6 +5,10 @@
struct JAUSection;
/**
* @ingroup jsystem-jaudio
*
*/
class JAUAudioArcLoader : public JAUAudioArcInterpreter {
public:
/* 802A4740 */ JAUAudioArcLoader(JAUSection*);
-1
View File
@@ -1,5 +1,4 @@
#ifndef JAUAUDIOMGR_H
#define JAUAUDIOMGR_H
#endif /* JAUAUDIOMGR_H */
+18 -1
View File
@@ -2,10 +2,14 @@
#define JAUBANKTABLE_H
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JASBankList.h"
#include "JSystem/JSupport/JSUList.h"
class JASBank;
/**
* @ingroup jsystem-jaudio
*
*/
class JAUBankTable /* : public JASBankList */ {
public:
JAUBankTable(u32 param_0, JASBank** param_1, u32 param_2) : mBankPtrTable(param_1, param_2) {
@@ -21,16 +25,29 @@ public:
/* 0xC */ u32 field_0xc;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUBankTableLink : public JSULink<JAUBankTable>, public JAUBankTable {
public:
JAUBankTableLink(u32 param_0, JASBank** param_1, u32 param_2) : JSULink<JAUBankTable>(this), JAUBankTable(param_0, param_1, param_2) {}
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUBankTableDictionary : JSUList<JAUBankTable> {
/* 802A4A80 */ void appendBankTable(JSULink<JAUBankTable>*);
};
class JASWaveBank;
/**
* @ingroup jsystem-jaudio
*
*/
class JAUWaveBankTable : private JASPtrArray<JASWaveBank,255> {
public:
JASWaveBank* getWaveBank(u32 index) { return get(index); }
@@ -1,5 +1,4 @@
#ifndef JAUCLUSTERSOUND_H
#define JAUCLUSTERSOUND_H
#endif /* JAUCLUSTERSOUND_H */
+8
View File
@@ -5,6 +5,10 @@
class JKRSolidHeap;
/**
* @ingroup jsystem-jaudio
*
*/
class JAU_JASInitializer {
public:
/* 802A4AD0 */ JAU_JASInitializer();
@@ -25,6 +29,10 @@ public:
/* 0x30 */ char* field_0x30;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAU_JAIInitializer {
public:
/* 802A4D3C */ JAU_JAIInitializer();
+8 -2
View File
@@ -1,8 +1,6 @@
#ifndef JAUSECTIONHEAP_H
#define JAUSECTIONHEAP_H
#include "JSystem/JAudio2/JAISeqDataMgr.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JAUBankTable.h"
#include "JSystem/JAudio2/JAUSeqDataBlockMgr.h"
#include "JSystem/JKernel/JKRDisposer.h"
@@ -21,6 +19,10 @@ class JAUSoundNameTable;
class JKRArchive;
class JKRSolidHeap;
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSection /* : public JKRDisposer, protected JSULink<JAUSection> */ {
public:
struct TSectionData {
@@ -75,6 +77,10 @@ public:
/* 0x38 */ TSectionData data_;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSectionHeap /* : public JAUSection, JASGlobalInstance<JAUSectionHeap>, JAISeqDataMgr */ {
public:
struct TSectionHeapData {
@@ -6,6 +6,10 @@
class JAISeqData;
class JAISeqDataRegion;
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSeqCollectionData {
s8 field_0x0;
s8 field_0x1;
@@ -14,6 +18,10 @@ struct JAUSeqCollectionData {
u32 field_0x8;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSeqCollection {
public:
/* 802A66A0 */ JAUSeqCollection();
@@ -29,6 +37,10 @@ public:
/* 0x0C */ int field_0xc;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSeqDataMgr_SeqCollection : public JAISeqDataMgr, public JAUSeqCollection {
public:
/* 802A677C */ JAUSeqDataMgr_SeqCollection();
+12 -1
View File
@@ -1,7 +1,6 @@
#ifndef JAUSEQDATABLOCKMGR_H
#define JAUSEQDATABLOCKMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JAISeqDataMgr.h"
#include "JSystem/JSupport/JSUList.h"
@@ -9,6 +8,10 @@ class JAISeqData;
class JAISeqDataUser;
class JKRArchive;
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSeqDataBlock {
/* 802A68F4 */ JAUSeqDataBlock();
@@ -18,6 +21,10 @@ struct JAUSeqDataBlock {
/* 0x1C */ int field_0x1c;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSeqDataBlocks : public JSUList<JAUSeqDataBlock> {
public:
/* 802A6928 */ u8* getSeqData(JAISoundID);
@@ -27,6 +34,10 @@ public:
/* 802A6A18 */ bool hasFailedBlock(JAISoundID);
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUDynamicSeqDataBlocks {
public:
/* 802A6A58 */ JAUDynamicSeqDataBlocks();
+12 -1
View File
@@ -2,10 +2,13 @@
#define JAUSOUNDANIMATOR_H
#include "JSystem/JAudio2/JAISound.h"
#include "dolphin/types.h"
class JAUSoundAnimation;
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSoundAnimationSound {
public:
bool playsOnlyForward() const { return (mFlags & 1) != 0; }
@@ -73,6 +76,10 @@ public:
/* 0x1B */ u8 unk_0x1b[5];
}; /* size 0x20 */
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSoundAnimationControl {
public:
virtual ~JAUSoundAnimationControl() = 0;
@@ -80,6 +87,10 @@ public:
virtual u16 getNumSounds(const JAUSoundAnimation*) = 0;
};
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSoundAnimation {
public:
/* 802A6F70 */ int getStartSoundIndex(f32) const;
+4 -1
View File
@@ -1,10 +1,13 @@
#ifndef JAUSOUNDINFO_H
#define JAUSOUNDINFO_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JAUAudibleParam.h"
/**
* @ingroup jsystem-jaudio
*
*/
class JAUSoundInfo : public JASGlobalInstance<JAUSoundInfo> {
public:
JAUSoundInfo(bool param_0) : JASGlobalInstance<JAUSoundInfo>(param_0) {}
+42
View File
@@ -4,6 +4,10 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundTableItem {
u8 mPriority;
u8 field_0x1;
@@ -12,6 +16,10 @@ struct JAUSoundTableItem {
f32 field_0x8;
};
/**
* @ingroup jsystem-jaudio
*
*/
template<typename Root, typename Section, typename Group, typename Typename_0>
struct JAUSoundTable_ {
JAUSoundTable_() {
@@ -71,11 +79,20 @@ struct JAUSoundTable_ {
u32 field_0xc;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundTableRoot {
static inline u32 magicNumber() { return 0x5420; }
u32 mSectionNumber;
u32 mSectionOffsets[0];
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundTableSection {
int getGroupOffset(int index) const {
if (index < 0) {
@@ -91,6 +108,10 @@ struct JAUSoundTableSection {
u32 mGroupOffsets[0];
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundTableGroup {
u8 getTypeID(int index) const {
if (index < 0) {
@@ -117,6 +138,10 @@ struct JAUSoundTableGroup {
u8 mTypeIds[0];
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundTable : public JASGlobalInstance<JAUSoundTable> {
JAUSoundTable(bool param_0) : JASGlobalInstance<JAUSoundTable>(param_0) {
}
@@ -139,14 +164,31 @@ struct JAUSoundTable : public JASGlobalInstance<JAUSoundTable> {
JAUSoundTable_<JAUSoundTableRoot,JAUSoundTableSection,JAUSoundTableGroup,void> field_0x0;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundNameTableRoot {
static inline u32 magicNumber() { return 0x544e; }
u32 mSectionNumber;
u32 mSectionOffsets[0];
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundNameTableSection {};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundNameTableGroup {};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUSoundNameTable : public JASGlobalInstance<JAUSoundNameTable> {
JAUSoundNameTable(bool param_0) : JASGlobalInstance<JAUSoundNameTable>(param_0) {
}
+8 -3
View File
@@ -1,12 +1,13 @@
#ifndef JAUSTREAMSTATICARAMMGR_H
#define JAUSTREAMSTATICARAMMGR_H
#include "JSystem/JAudio2/JAIStreamDataMgr.h"
#include "JSystem/JAudio2/JASAramStream.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "bitset.h"
/**
* @ingroup jsystem-jaudio
*
*/
template <size_t A0>
class JAUStreamAramMgrBase_ : public JAIStreamAramMgr {
public:
@@ -35,6 +36,10 @@ protected:
JASHeap mHeaps[A0];
};
/**
* @ingroup jsystem-jaudio
*
*/
template <size_t MAX_CHUNKS_>
class JAUStreamStaticAramMgr_ : public JAUStreamAramMgrBase_<MAX_CHUNKS_> {
public:
@@ -9,6 +9,10 @@ struct BinaryStreamFileTable {
/* 0x8 */ int mFilePathOffsets[];
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUStreamFileTable {
/* 802A7420 */ JAUStreamFileTable();
/* 802A742C */ void init(void const*);
@@ -20,6 +24,10 @@ struct JAUStreamFileTable {
/* 0x0 */ const BinaryStreamFileTable* mData;
};
/**
* @ingroup jsystem-jaudio
*
*/
struct JAUStreamDataMgr_StreamFileTable : public JAIStreamDataMgr, JAUStreamFileTable {
/* 802A74AC */ virtual s32 getStreamFileEntry(JAISoundID);
/* 802A74E8 */ virtual ~JAUStreamDataMgr_StreamFileTable() {}