mirror of
https://github.com/zeldaret/tww.git
synced 2026-09-05 10:27:35 -04:00
JASDSPChannel inline fixes, match TDSPChannel::alloc
This commit is contained in:
LagoLunatic
@@ -47,7 +47,11 @@ namespace JASystem {
|
||||
void setPriorityTime(u16 time) { mPriorityTime = time; }
|
||||
u16 getCBInterval() { return mCBInterval; }
|
||||
void setCBInterval(u16 interval) { mCBInterval = interval; }
|
||||
void decCBInterval() { mCBInterval--; }
|
||||
void decCBInterval() {
|
||||
if (mCBInterval != 0) {
|
||||
mCBInterval--;
|
||||
}
|
||||
}
|
||||
TChannel* getLogicalChannel() {
|
||||
if (mCallback != NULL) {
|
||||
return (TChannel*)field_0x8; // ?? is this userdata?
|
||||
@@ -55,10 +59,23 @@ namespace JASystem {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
BOOL isFree() {
|
||||
if (mStatus == 1) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
// is this right?
|
||||
BOOL checkSign(u32 value) {
|
||||
if (field_0x8 == value) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: inlines
|
||||
void checkSign(u32) {}
|
||||
void isFree() {}
|
||||
// TODO
|
||||
void forceStop(TDSPChannel*) {}
|
||||
void release(TDSPChannel*, u32) {}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace JASystem {
|
||||
/* 0x14 */ int field_0x14;
|
||||
/* 0x18 */ int field_0x18;
|
||||
/* 0x1C */ int field_0x1c;
|
||||
/* 0x20 */ short field_0x20;
|
||||
/* 0x22 */ short field_0x22;
|
||||
/* 0x20 */ s16 field_0x20;
|
||||
/* 0x22 */ s16 field_0x22;
|
||||
/* 0x24 */ u32* field_0x24;
|
||||
};
|
||||
}
|
||||
@@ -23,25 +23,25 @@ namespace JASystem {
|
||||
struct FxlineConfig_ {
|
||||
/* 0x00 */ u8 field_0x0;
|
||||
/* 0x02 */ u16 field_0x2;
|
||||
/* 0x04 */ short field_0x4;
|
||||
/* 0x04 */ s16 field_0x4;
|
||||
/* 0x06 */ u16 field_0x6;
|
||||
/* 0x08 */ short field_0x8;
|
||||
/* 0x08 */ s16 field_0x8;
|
||||
/* 0x0C */ int field_0xc;
|
||||
/* 0x10 */ short field_0x10[8];
|
||||
/* 0x10 */ s16 field_0x10[8];
|
||||
};
|
||||
|
||||
class FXBuffer {
|
||||
public:
|
||||
bool setFXLine(s16* param_1, FxlineConfig_* param_2);
|
||||
|
||||
/* 0x00 */ short field_0x0;
|
||||
/* 0x02 */ short field_0x2;
|
||||
/* 0x00 */ s16 field_0x0;
|
||||
/* 0x02 */ s16 field_0x2;
|
||||
/* 0x04 */ s16* field_0x4;
|
||||
/* 0x08 */ short field_0x8;
|
||||
/* 0x0A */ short field_0xa;
|
||||
/* 0x0C */ short field_0xc;
|
||||
/* 0x0E */ short field_0xe;
|
||||
/* 0x10 */ short field_0x10[8];
|
||||
/* 0x08 */ s16 field_0x8;
|
||||
/* 0x0A */ s16 field_0xa;
|
||||
/* 0x0C */ s16 field_0xc;
|
||||
/* 0x0E */ s16 field_0xe;
|
||||
/* 0x10 */ s16 field_0x10[8];
|
||||
};
|
||||
|
||||
class DSPBuffer {
|
||||
@@ -56,7 +56,7 @@ namespace JASystem {
|
||||
void setMixerInitDelayMax(u8 param_1);
|
||||
void setMixerInitVolume(u8 param_1, s16 param_2, u8 param_3);
|
||||
void setMixerVolume(u8 param_1, s16 param_2, u8 param_3);
|
||||
void setMixerVolumeOnly(u8 param_1, short param_2);
|
||||
void setMixerVolumeOnly(u8 param_1, s16 param_2);
|
||||
void setPauseFlag(u8 param_1);
|
||||
void flushChannel();
|
||||
void initFilter();
|
||||
@@ -78,45 +78,45 @@ namespace JASystem {
|
||||
/* 0x18 */ u8 field_0x18[0x50 - 0x18];
|
||||
/* 0x50 */ u16 field_0x50;
|
||||
/* 0x52 */ u16 field_0x52;
|
||||
/* 0x54 */ short field_0x54;
|
||||
/* 0x54 */ s16 field_0x54;
|
||||
/* 0x56 */ u16 field_0x56;
|
||||
/* 0x58 */ u16 field_0x58;
|
||||
/* 0x5A */ u8 field_0x5a[0x60 - 0x5a];
|
||||
/* 0x60 */ short field_0x60;
|
||||
/* 0x60 */ s16 field_0x60;
|
||||
/* 0x62 */ u8 field_0x62[0x64 - 0x62];
|
||||
/* 0x64 */ short field_0x64;
|
||||
/* 0x66 */ short field_0x66;
|
||||
/* 0x64 */ s16 field_0x64;
|
||||
/* 0x66 */ s16 field_0x66;
|
||||
/* 0x68 */ int field_0x68;
|
||||
/* 0x6C */ u32 field_0x6c;
|
||||
/* 0x70 */ u8 field_0x70[0x74 - 0x70];
|
||||
/* 0x74 */ u32 field_0x74;
|
||||
/* 0x78 */ short field_0x78[4];
|
||||
/* 0x80 */ short field_0x80[20];
|
||||
/* 0xA8 */ short field_0xa8[4];
|
||||
/* 0x78 */ s16 field_0x78[4];
|
||||
/* 0x80 */ s16 field_0x80[20];
|
||||
/* 0xA8 */ s16 field_0xa8[4];
|
||||
/* 0xB8 */ u16 field_0xb0[16];
|
||||
/* 0xD0 */ u8 field_0xd0[0x100 - 0xd0];
|
||||
/* 0x100 */ u16 field_0x100;
|
||||
/* 0x102 */ u16 field_0x102;
|
||||
/* 0x104 */ short field_0x104;
|
||||
/* 0x106 */ short field_0x106;
|
||||
/* 0x108 */ short field_0x108;
|
||||
/* 0x104 */ s16 field_0x104;
|
||||
/* 0x106 */ s16 field_0x106;
|
||||
/* 0x108 */ s16 field_0x108;
|
||||
/* 0x10A */ u16 field_0x10a;
|
||||
/* 0x10C */ u32 field_0x10c;
|
||||
/* 0x110 */ u32 field_0x110;
|
||||
/* 0x114 */ u32 field_0x114;
|
||||
/* 0x118 */ u32 field_0x118;
|
||||
/* 0x11C */ int field_0x11c;
|
||||
/* 0x120 */ short field_0x120[8];
|
||||
/* 0x120 */ s16 field_0x120[8];
|
||||
/* 0x130 */ u8 field_0x130[0x148 - 0x130];
|
||||
/* 0x148 */ short field_0x148[4];
|
||||
/* 0x150 */ short field_0x150;
|
||||
/* 0x148 */ s16 field_0x148[4];
|
||||
/* 0x150 */ s16 field_0x150;
|
||||
/* 0x152 */ u8 field_0x152[0x180 - 0x152];
|
||||
};
|
||||
|
||||
|
||||
void setDSPMixerLevel(float param_1);
|
||||
DSPBuffer* getDSPHandle(u8 param_1);
|
||||
void setFilterTable(short* param_1, short* param_2, u32 param_3);
|
||||
void setFilterTable(s16* param_1, s16* param_2, u32 param_3);
|
||||
void flushBuffer();
|
||||
void invalChannelAll();
|
||||
void clearBuffer();
|
||||
|
||||
@@ -32,8 +32,7 @@ int JASystem::TDSPChannel::allocate(u32 param_1) {
|
||||
if (mStatus != 1) {
|
||||
return false;
|
||||
}
|
||||
BOOL r0 = (field_0x8 == 0) ? TRUE : FALSE;
|
||||
if (!r0) {
|
||||
if (!checkSign(0)) {
|
||||
OSReport("sign %x があるのにCH.%d はFREE\n", field_0x8, mNumber);
|
||||
}
|
||||
mStatus = 0;
|
||||
@@ -59,7 +58,7 @@ bool JASystem::TDSPChannel::forceStop() {
|
||||
if (mStatus == 2) {
|
||||
return false;
|
||||
}
|
||||
if (mStatus == 1) {
|
||||
if (isFree()) {
|
||||
OSReport("----- JASDSPChannel::forceStop Warning! : CH_FREE\n");
|
||||
return false;
|
||||
}
|
||||
@@ -121,8 +120,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::alloc(u32 param_1, u32 param_2) {
|
||||
}
|
||||
int i = 0;
|
||||
do {
|
||||
BOOL r0 = DSPCH[i].getStatus() == 1 ? TRUE : FALSE;
|
||||
if (r0 && DSPCH[i].allocate(param_2)) {
|
||||
if (DSPCH[i].isFree() && DSPCH[i].allocate(param_2)) {
|
||||
smnFree--;
|
||||
smnUse++;
|
||||
return &DSPCH[i];
|
||||
@@ -138,14 +136,14 @@ int JASystem::TDSPChannel::free(JASystem::TDSPChannel* dspch, u32 param_2) {
|
||||
OSReport("----- JASDSPChannel::free : NULL のチャネルを解放しようとしました\n");
|
||||
return -1;
|
||||
}
|
||||
if (dspch->field_0x8 != param_2) {
|
||||
if (!dspch->checkSign(param_2)) {
|
||||
OSReport("----- JASDSPChannel::free : BAD USERが開放を試みた\n");
|
||||
return -2;
|
||||
}
|
||||
if (dspch->getStatus() == 0) {
|
||||
if (dspch->mStatus == 0) {
|
||||
smnUse--;
|
||||
}
|
||||
if (dspch->getStatus() != 1) {
|
||||
if (!dspch->isFree()) {
|
||||
smnFree++;
|
||||
}
|
||||
dspch->free();
|
||||
@@ -163,7 +161,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::getLower() {
|
||||
if (dspch->getStatus() == 2) {
|
||||
continue;
|
||||
}
|
||||
if (dspch->getStatus() == 1) {
|
||||
if (dspch->isFree()) {
|
||||
r30 = i;
|
||||
break;
|
||||
}
|
||||
@@ -195,7 +193,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::getLowerActive() {
|
||||
r27 = 0;
|
||||
for (i = 0; i < 64; i++) {
|
||||
TDSPChannel* dspch = &DSPCH[i];
|
||||
if (dspch->getStatus() == 2 || dspch->getStatus() == 1) {
|
||||
if (dspch->getStatus() == 2 || dspch->isFree()) {
|
||||
continue;
|
||||
}
|
||||
r30 = dspch->getPriority();
|
||||
@@ -277,7 +275,7 @@ void JASystem::TDSPChannel::updateAll() {
|
||||
}
|
||||
dspBuffer = DSPCH[i].field_0xc;
|
||||
TDSPChannel* dspChannel = &DSPCH[i];
|
||||
if (dspChannel->getStatus() == 1) {
|
||||
if (dspChannel->isFree()) {
|
||||
continue;
|
||||
}
|
||||
if (dspBuffer->field_0x2 != 0) {
|
||||
@@ -287,7 +285,7 @@ void JASystem::TDSPChannel::updateAll() {
|
||||
dspBuffer->field_0x2 = 0;
|
||||
dspBuffer->field_0x0 = 0;
|
||||
dspBuffer->flushChannel();
|
||||
if (dspChannel->getStatus() == 1) {
|
||||
if (dspChannel->isFree()) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -298,9 +296,7 @@ void JASystem::TDSPChannel::updateAll() {
|
||||
}
|
||||
}
|
||||
if (dspChannel->mCallback) {
|
||||
if (dspChannel->getCBInterval() != 0) {
|
||||
dspChannel->decCBInterval();
|
||||
}
|
||||
dspChannel->decCBInterval();
|
||||
if (dspChannel->getCBInterval() == 0) {
|
||||
dspChannel->onUpdate(0);
|
||||
if (dspChannel->getCBInterval() == 0) {
|
||||
|
||||
Reference in New Issue
Block a user