summaryrefslogtreecommitdiff
path: root/src/JSystem/JAudio2/JASBNKParser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/JSystem/JAudio2/JASBNKParser.cpp')
-rw-r--r--src/JSystem/JAudio2/JASBNKParser.cpp90
1 files changed, 54 insertions, 36 deletions
diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp
index ec57df253a..66b9746715 100644
--- a/src/JSystem/JAudio2/JASBNKParser.cpp
+++ b/src/JSystem/JAudio2/JASBNKParser.cpp
@@ -62,8 +62,11 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
}
TEnvtChunk* envt_chunk = (TEnvtChunk*)findChunk(stream, 'ENVT');
+ JUT_ASSERT(139, envt_chunk);
TOscChunk* osc_chunk = (TOscChunk*)findChunk(stream, 'OSCT');
+ JUT_ASSERT(142, osc_chunk);
TListChunk* list_chunk = (TListChunk*)findChunk(stream, 'LIST');
+ JUT_ASSERT(145, list_chunk);
u8* envt = new (heap, 2) u8[envt_chunk->mSize];
JASCalc::bcopy(envt_chunk->mData, envt, envt_chunk->mSize);
@@ -72,36 +75,40 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
u32 count = *ptr++;
JASOscillator::Data* osc_data = new (heap, 0) JASOscillator::Data[count];
for (int i = 0; i < count; i++, ptr += sizeof(TOsc) >> 2) {
- TOsc* osc = (TOsc*)ptr;
+ TOsc* op = (TOsc*)ptr;
+ JUT_ASSERT(155, op->id == 'Osci');
JASOscillator::Data* data = &osc_data[i];
- data->mTarget = osc->mTarget;
- data->_04 = osc->_08;
- data->mScale = osc->mScale;
- data->_14 = osc->_18;
- data->mTable = (JASOscillator::Point*)(envt + osc->mTableOffset);
- data->rel_table = (JASOscillator::Point*)(envt + osc->_10);
+ data->mTarget = op->mTarget;
+ data->_04 = op->_08;
+ data->mScale = op->mScale;
+ data->_14 = op->_18;
+ data->mTable = (JASOscillator::Point*)(envt + op->mTableOffset);
+ data->rel_table = (JASOscillator::Point*)(envt + op->_10);
}
+ TListChunk* list = list_chunk;
+ JUT_ASSERT(172, list->count <= JASBank::PRG_OSC);
- bank->newInstTable(list_chunk->mCount, heap);
- for (int i = 0; i < list_chunk->mCount; i++) {
+ bank->newInstTable(list_chunk->count, heap);
+ for (int i = 0; i < list_chunk->count; i++) {
if (list_chunk->mOffsets[i] != 0) {
u32* data = (u32*)((intptr_t)stream + list_chunk->mOffsets[i]);
switch (*data++) {
case 'Inst': {
- JASBasicInst* inst = new (heap, 0) JASBasicInst();
+ JASBasicInst* instp = new (heap, 0) JASBasicInst();
+ JUT_ASSERT(187, instp != 0);
u32 count = *data++;
for (int j = 0; j < count; j++) {
u32 index = *data++;
- inst->setOsc(j, &osc_data[index]);
+ instp->setOsc(j, &osc_data[index]);
}
count = *data++;
for (int j = 0; j < count; j++) {
data++;
}
count = *data++;
- inst->setKeyRegionCount(count, heap);
+ instp->setKeyRegionCount(count, heap);
for (int j = 0; j < count; j++) {
- JASBasicInst::TKeymap* keymap = inst->getKeyRegion(j);
+ JASBasicInst::TKeymap* keymap = instp->getKeyRegion(j);
keymap->setHighKey(*data >> 0x18);
u32 fVar4 = data[1];
keymap->field_0x4 = JSULoHalf(data[3]);
@@ -112,42 +119,51 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
data += 4;
}
}
- inst->setVolume(*(f32*)&data[0]);
- inst->setPitch(*(f32*)&data[1]);
- bank->setInst(i, inst);
+ instp->setVolume(*(f32*)&data[0]);
+ instp->setPitch(*(f32*)&data[1]);
+ bank->setInst(i, instp);
break;
}
case 'Perc': {
- JASDrumSet* drum = new (heap, 0) JASDrumSet();
+ JASDrumSet* drump = new (heap, 0) JASDrumSet();
+ JUT_ASSERT(264, drump != 0);
+ u32 pmap_count = data[1];
+ JUT_ASSERT(268, pmap_count <= 128);
u32 count = *data++;
- drum->newPercArray(count, heap);
+ drump->newPercArray(count, heap);
for (int j = 0; j < count; j++) {
u32 offset = *data++;
if (offset != 0) {
- JASDrumSet::TPerc* perc = new (heap, 0) JASDrumSet::TPerc();
+ JASDrumSet::TPerc* percp = new (heap, 0) JASDrumSet::TPerc();
+ JUT_ASSERT(277, percp);
+ u32 type = data[0];
+ JUT_ASSERT(282, type == 'Pmap');
u32* ptr = (u32*)((intptr_t)stream + offset);
TPercData* perc_data = (TPercData*)(ptr + 1);
- perc->setVolume(perc_data->mVolume);
- perc->setPitch(perc_data->mPitch);
- perc->setPan((f32)perc_data->mPan / 127.0f);
- perc->setRelease(perc_data->mRelease);
+ percp->setVolume(perc_data->mVolume);
+ percp->setPitch(perc_data->mPitch);
+ percp->setPan((f32)perc_data->mPan / 127.0f);
+ percp->setRelease(perc_data->mRelease);
ptr = (u32*)&perc_data->field_0xc;
u32 count2 = *ptr++;
for (int k = 0; k < count2; k++) {
ptr++;
}
u32 pVar6 = ptr[0];
- perc->field_0xe = JSULoHalf(ptr[2]);
- perc->field_0x10 = *(f32*)&ptr[3];
- perc->field_0x14 = *(f32*)&ptr[4];
+ percp->field_0xe = JSULoHalf(ptr[2]);
+ percp->field_0x10 = *(f32*)&ptr[3];
+ percp->field_0x14 = *(f32*)&ptr[4];
for (int k = 0; k < pVar6; k++) {}
- drum->setPerc(j, perc);
+ drump->setPerc(j, percp);
}
}
- bank->setInst(i, drum);
+ bank->setInst(i, drump);
break;
}
+ default:
+ JUT_PANIC(338, "Unexpected Inst Type");
+ break;
}
}
}
@@ -277,8 +293,7 @@ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader
TInst* tinst = data->mInstOffset[i].ptr(header);
if (tinst != NULL) {
for (int j = 0; j < 2; j++) {
- TOsc* tosc = tinst->mOscOffset[j].ptr(header);
- if (tosc == osc) {
+ if (tinst->mOscOffset[j].ptr(header) == osc) {
JASInst* inst = bank->getInst(i);
if (inst != NULL) {
JASInstParam param;
@@ -295,12 +310,15 @@ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader
}
JASOscillator::Point const* JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator::Point const* points) {
- s16 tmp;
- do {
- tmp = points->_0;
- points++;
- } while (tmp <= 10);
- return points;
+ const JASOscillator::Point* ptr = points;
+ while(true) {
+ s16 tmp = ptr->_0;
+ ptr++;
+ if (tmp > 10) {
+ break;
+ }
+ }
+ return ptr;
}
// Fakematch? Why is this here?
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 16:45:15 +0000