Scaffold JAIStreamMgr.cpp

This commit is contained in:
HeartPiece44 2024-05-02 17:11:28 +10:00
parent cd86f113e4
commit 4d6381450c
6 changed files with 369 additions and 647 deletions

View File

@ -45,14 +45,14 @@
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 23607 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRHeap.cpp">JKernel/JKRHeap.cpp</a> | 23801 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 26174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModel.cpp">J3D/J3DModel.cpp</a> | 28333 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialAttach.cpp">J3D/J3DMaterialAttach.cpp</a> | 29965 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DScreen.cpp">J2D/J2DScreen.cpp</a> | 30767 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 30939 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 35148 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 30940 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 35148 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-actor.cpp">JStudio_JStage/object-actor.cpp</a> | 35187 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 35637 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAParticle.cpp">JParticle/JPAParticle.cpp</a> | 36971 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39437 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40005 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 46511 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 47092 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 48617 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 50054 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 55221 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 58986 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 61188 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 53563 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 55221 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 58986 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 61188 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 75520 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 80652 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 84385 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 84860 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88904 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 89090 |

View File

@ -133,6 +133,22 @@ struct JAIStream : public JAISound {
void getStreamInterFxmix(u8 type);
void getStreamInterDolby(u8 type);
inline void initStreamParam()
{
mStreamParameter.mPans
= new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAIGlobalParameter::getParamStreamParameterLines()];
mStreamParameter.mPitches
= new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAIGlobalParameter::getParamStreamParameterLines()];
mStreamParameter.mFxmixes
= new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSetInitZero[JAIGlobalParameter::getParamStreamParameterLines()];
mStreamParameter.mDolbys
= new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSetInitZero[JAIGlobalParameter::getParamStreamParameterLines()];
mStreamParameter.mChannelVolumes = new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAInter::StreamMgr::sChannelMax];
mStreamParameter.mChannelPans = new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAInter::StreamMgr::sChannelMax];
mStreamParameter.mChannelFxmixes = new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAInter::StreamMgr::sChannelMax];
mStreamParameter.mChannelDolbys = new (JAIBasic::msCurrentHeap, 0x20) JAInter::MoveParaSet[JAInter::StreamMgr::sChannelMax];
}
// _00-_10 = JSULink
// _10 = VTABLE
// _14-_48 = JAISound

View File

@ -25,7 +25,7 @@ enum JAISoundTrackActiveFlags {
SOUNDACTIVE_Unk6 = 1 << 5, // 0x20
SOUNDACTIVE_ChannelVolume = 1 << 6, // 0x40
SOUNDACTIVE_ChannelPan = 1 << 7, // 0x80
SOUNDACTIVE_Unk9 = 1 << 8, // 0x100
SOUNDACTIVE_ChannelDolby = 1 << 8, // 0x100
SOUNDACTIVE_Unk10 = 1 << 9, // 0x200
SOUNDACTIVE_Unk11 = 1 << 10, // 0x400
SOUNDACTIVE_TrackFxmix = 1 << 11, // 0x800

View File

@ -79,14 +79,15 @@ void setChannelMax(u32);
void setExternalAramBuffer(ExternalAramBufferCallback);
extern struct Flags {
u16 _0 : 1;
u16 _1 : 1;
u16 _2 : 1;
u16 _3 : 1;
u16 _4 : 1;
u16 _5 : 1;
u16 _6 : 1;
u16 _00 : 1;
u16 _01 : 1;
u16 _02 : 1;
u16 _03 : 1;
u16 _04 : 1;
u16 _05 : 1;
u16 _06 : 1;
} flags;
extern u8 prepareSw;
extern u8 prepareFlag;
extern u8 externalAram;

View File

@ -558,7 +558,7 @@ void JAIBasic::startSoundBasic(u32 id, JAISe** handlePtr, JAInter::Actor* actor,
*/
void JAIBasic::startSoundBasic(u32 id, JAIStream** handlePtr, JAInter::Actor* actor, u32 p4, u8 p5, JAInter::SoundInfo* info)
{
if (_0E._2 != true && JAInter::StreamMgr::flags._1 == 0) {
if (_0E._2 != true && JAInter::StreamMgr::flags._01 == 0) {
JAInter::StreamMgr::storeStreamBuffer(handlePtr, actor, id, p4, p5, info);
}
}

File diff suppressed because it is too large Load Diff