mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-10 11:55:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

JAS work

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-11-08 00:41:29 -08:00
parent 044fec8706
commit 47303cd4b7
16 changed files with 209 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JAudio/JASBasicInst.h
+15 -8
View File
@@ -8,21 +8,28 @@ namespace JASystem {
class TInstEffect;
class TBasicInst : public TInst {
public:
struct TVeloRegion {
/* 0x00 */ s32 mBaseVel;
/* 0x04 */ s32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
};
class TKeymap {
public:
TKeymap() {
field_0x0 = -1;
field_0x4 = 0;
mBaseKey = -1;
mVeloRegionCount = 0;
mVelomap = NULL;
}
~TKeymap();
void setVeloRegionCount(u32);
void* getVeloRegion(int);
const void* getVeloRegion(int) const;
TVeloRegion* getVeloRegion(int);
const TVeloRegion* getVeloRegion(int) const;
/* 0x00 */ int field_0x0;
/* 0x04 */ u32 field_0x4;
/* 0x08 */ void* mVelomap;
/* 0x00 */ int mBaseKey;
/* 0x04 */ u32 mVeloRegionCount;
/* 0x08 */ TVeloRegion* mVelomap;
};
TBasicInst();
@@ -43,7 +50,7 @@ namespace JASystem {
/* 0x10 */ u32 mEffectCount;
/* 0x14 */ TOscillator::Osc_** mOsc;
/* 0x18 */ u32 mOscCount;
/* 0x1C */ u32 field_0x1c;
/* 0x1C */ u32 mKeyRegionCount;
/* 0x20 */ TKeymap* mKeymap;
};
}
include/JSystem/JAudio/JASBasicWaveBank.h
+11 -11
View File
@@ -13,34 +13,34 @@ namespace JASystem {
public:
~TWaveHandle() {}
const JASystem::TWaveInfo* getWaveInfo() const {
return &field_0x4;
return &mWaveInfo;
}
const void* getWavePtr() const {
JUT_ASSERT(77, mHeap);
if (!mHeap->mBase) {
return NULL;
}
return (u8*)mHeap->mBase + field_0x4.field_0x8;
return (u8*)mHeap->mBase + mWaveInfo.mWavePtrOffs;
}
/* 0x04 */ JASystem::TWaveInfo field_0x4;
/* 0x04 */ JASystem::TWaveInfo mWaveInfo;
/* 0x30 */ Kernel::THeap* mHeap;
};
class TWaveInfo {
public:
TWaveInfo() {
field_0x0.mHeap = NULL;
field_0x34 = 0;
field_0x38 = NULL;
field_0x3c = NULL;
mWaveHandle.mHeap = NULL;
mWaveID = 0;
mPrev = NULL;
mNext = NULL;
}
~TWaveInfo();
/* 0x00 */ TWaveHandle field_0x0;
/* 0x34 */ u32 field_0x34;
/* 0x38 */ TWaveInfo* field_0x38;
/* 0x3C */ TWaveInfo* field_0x3c;
/* 0x00 */ TWaveHandle mWaveHandle;
/* 0x34 */ u32 mWaveID;
/* 0x38 */ TWaveInfo* mPrev;
/* 0x3C */ TWaveInfo* mNext;
};
class TWaveGroup : public TWaveArc {
include/JSystem/JAudio/JASDvdThread.h
+5 -5
View File
@@ -15,16 +15,16 @@ public:
};
JASTaskThread(u32 param_1, int param_2, s32 param_3) : JKRThread(param_1, param_2, param_3) {
field_0x70 = 0;
OSInitThreadQueue(&field_0x68);
mPaused = 0;
OSInitThreadQueue(&mQ);
}
~JASTaskThread();
BOOL sendCmdMsg(s32 (*)(void*), void*, u32);
void* run();
void pause(bool);
/* 0x68 */ OSThreadQueue field_0x68;
/* 0x70 */ u8 field_0x70;
/* 0x68 */ OSThreadQueue mQ;
/* 0x70 */ u8 mPaused;
};
namespace JASystem {
@@ -35,7 +35,7 @@ namespace JASystem {
int checkPassDvdT(u32, u32*, void (*)(u32));
u32 checkFile(char*);
void unpauseDvdT();
int dvdThreadCheckBack(void*);
s32 dvdThreadCheckBack(void*);
extern JASTaskThread* sThread;
}
include/JSystem/JAudio/JASSimpleWaveBank.h
+3 -3
View File
@@ -12,15 +12,15 @@ namespace JASystem {
public:
TWaveHandle() { mHeap = NULL; }
~TWaveHandle();
const TWaveInfo* getWaveInfo() const { return &field_0x4; };
const TWaveInfo* getWaveInfo() const { return &mWaveInfo; }
const void* getWavePtr() const {
if (mHeap->mBase == NULL) {
return NULL;
}
return (u8*)mHeap->mBase + field_0x4.field_0x8;
return (u8*)mHeap->mBase + mWaveInfo.mWavePtrOffs;
}
/* 0x04 */ TWaveInfo field_0x4;
/* 0x04 */ TWaveInfo mWaveInfo;
/* 0x30 */ Kernel::THeap* mHeap;
};
include/JSystem/JAudio/JASWaveArcLoader.h
+3 -3
View File
@@ -30,12 +30,12 @@ namespace JASystem {
void setEntryNum(s32);
void setFileName(const char*);
/* 0x04 */ Kernel::THeap field_0x4;
/* 0x04 */ Kernel::THeap mHeap;
/* 0x4C */ int field_0x4c;
/* 0x50 */ OSMutex mMutex;
/* 0x68 */ int field_0x68;
/* 0x6C */ int field_0x6c;
/* 0x70 */ int field_0x70;
/* 0x6C */ int mFileNo;
/* 0x70 */ int mSize;
/* 0x74 */ int field_0x74;
};
}
include/JSystem/JAudio/JASWaveBank.h
+1 -1
View File
@@ -13,7 +13,7 @@ namespace JASystem {
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ int field_0x8;
/* 0x08 */ int mWavePtrOffs;
/* 0x0C */ int field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;