mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 22:31:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

JASChannel OK

Browse Source
This commit is contained in:
LagoLunatic
2025-03-15 19:55:45 -04:00
parent e9afe4c428
commit 89e9cdafb5
14 changed files with 755 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -807,7 +807,7 @@ config.libs = [
Object(Matching, "JSystem/JAudio/JASDriverIF.cpp"),
Object(Matching, "JSystem/JAudio/JASChGlobal.cpp"),
Object(Matching, "JSystem/JAudio/JASChAllocQueue.cpp"),
Object(NonMatching, "JSystem/JAudio/JASChannel.cpp"),
Object(Matching, "JSystem/JAudio/JASChannel.cpp"),
Object(NonMatching, "JSystem/JAudio/JASChannelMgr.cpp"),
Object(Matching, "JSystem/JAudio/JASOscillator.cpp"),
Object(Matching, "JSystem/JAudio/JASDriverTables.cpp"),
include/JSystem/JAudio/JASChAllocQueue.h
-1
View File
@@ -10,7 +10,6 @@ namespace JASystem {
void enQueue(JASystem::TChannel*);
int deleteQueue(JASystem::TChannel*);
void checkQueue();
}
extern JSUList<TChannel> sDspQueueList;
include/JSystem/JAudio/JASChannel.h
+37 -20
View File
@@ -14,6 +14,23 @@ namespace JASystem {
class TChannel {
public:
enum CalcType {
// NB: haven't seen others used, add from calc_sw_table in JASChannel.cpp if needed
CALC_None = 0,
CALC_AddChannelOnly = 1,
CALC_AddAll = 13,
CALC_WeightAll = 26,
};
union MixConfig {
u16 mWhole;
struct {
u8 u;
u8 l0 : 4;
u8 l1 : 4;
} mParts;
};
TChannel() : field_0x4(NULL), field_0x8(NULL), field_0x20(NULL), field_0x24(NULL), field_0xd8(this) {
for (int i = 0; i < 4; i++) {
osc[i] = NULL;
@@ -28,7 +45,7 @@ namespace JASystem {
void directReleaseOsc(u32, u16);
f32 bankOscToOfs(u32);
void effectOsc(u32, f32);
int getOscState(u32) const;
u8 getOscState(u32) const;
BOOL isOsc(u32);
void copyOsc(u32, TOscillator::Osc_*);
void overwriteOsc(u32, TOscillator::Osc_*);
@@ -41,24 +58,24 @@ namespace JASystem {
void stop(u16);
void updateJcToDSP();
bool forceStopLogicalChannel();
bool stopLogicalChannel();
int playLogicalChannel();
BOOL stopLogicalChannel();
BOOL playLogicalChannel();
void updateEffectorParam();
static void killBrokenLogicalChannels(TDSPChannel*);
static void updatecallDSPChannel(TDSPChannel*, u32);
static int updatecallDSPChannel(TDSPChannel*, u32);
static f32 calcEffect(const Driver::PanMatrix_*, const Driver::PanMatrix_*, u8);
static f32 calcPan(const Driver::PanMatrix_*, const Driver::PanMatrix_*, u8);
void updateJcToDSPInit();
void updateAutoMixer(f32, f32, f32, f32);
void updateMixer(f32, f32, f32, f32);
void extraUpdate(TChannel*, u32);
static void updatecallLogicalChannel(TChannel*, u32);
static u32 extraUpdate(TChannel*, u32);
static BOOL updatecallLogicalChannel(TChannel*, u32);
u8 getNoteOnPriority() const { return field_0x48; }
u8 getReleasePriority() const { return field_0x48 >> 8; }
u8 getLifeTimePriority() const { return field_0x48 >> 0x10; }
// TODO
void getLifeTimePriority() const {}
void getReleasePriority() const {}
void setSkipSamples(u32) {}
/* 0x00 */ u8 field_0x0;
@@ -74,38 +91,38 @@ namespace JASystem {
/* 0x1C */ int field_0x1c;
/* 0x20 */ TDSPChannel* field_0x20;
/* 0x24 */ TChannel* field_0x24;
/* 0x28 */ void (*field_0x28)(TChannel*, u32);
/* 0x2C */ int field_0x2c;
/* 0x28 */ BOOL (*field_0x28)(TChannel*, u32);
/* 0x2C */ u32 (*field_0x2c)(TChannel*, u32);
/* 0x30 */ int field_0x30;
/* 0x34 */ int field_0x34;
/* 0x34 */ s32 field_0x34;
/* 0x38 */ TOscillator* osc[4];
/* 0x48 */ u32 field_0x48;
/* 0x4C */ short field_0x4c;
/* 0x4C */ u16 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ u8 field_0x60[3];
/* 0x64 */ Driver::PanMatrix_ field_0x64;
/* 0x70 */ Driver::PanMatrix_ field_0x70;
/* 0x7C */ Driver::PanMatrix_ field_0x7c;
/* 0x88 */ Driver::PanMatrix_ field_0x88;
/* 0x60 */ u8 mCalcTypes[3]; // Pan, FxMix, ?
/* 0x64 */ Driver::PanMatrix_ mPanPower;
/* 0x70 */ Driver::PanMatrix_ mPanVec;
/* 0x7C */ Driver::PanMatrix_ mFxmixVec;
/* 0x88 */ Driver::PanMatrix_ mDolbyVec;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ f32 field_0x9c;
/* 0xA0 */ u16 field_0xa0;
/* 0xA0 */ u16 mPitch;
/* 0xA2 */ u16 field_0xa2;
/* 0xA4 */ TChannelMgr* field_0xa4;
/* 0xA8 */ f32 field_0xa8;
/* 0xAC */ f32 field_0xac;
/* 0xB0 */ u16 field_0xb0[6];
/* 0xB0 */ MixConfig mMixConfigs[6];
/* 0xBC */ u16 field_0xbc[6];
/* 0xC8 */ u16 field_0xc8;
/* 0xCC */ int field_0xcc;
/* 0xD0 */ int field_0xd0;
/* 0xD4 */ int field_0xd4;
/* 0xD8 */ JSULink<TChannel> field_0xd8;
/* 0xE8 */ int field_0xe8;
/* 0xE8 */ u32 field_0xe8;
};
}
include/JSystem/JAudio/JASChannelMgr.h
+3 -3
View File
@@ -13,8 +13,8 @@ namespace JASystem {
void stopAllRelease();
void initAllocChannel(u32);
TChannel* getLogicalChannel(u32);
bool moveListHead(TChannel*, u32);
bool moveListTail(TChannel*, u32);
BOOL moveListHead(TChannel*, u32);
BOOL moveListTail(TChannel*, u32);
void addListHead(TChannel*, u32);
void addListTail(TChannel*, u32);
TChannel* getListHead(u32);
@@ -24,7 +24,7 @@ namespace JASystem {
void checkLimitStop(TChannel*, u32);
/* 0x00 */ u32 field_0x0;
/* 0x04 */ int field_0x4;
/* 0x04 */ u32 field_0x4;
/* 0x08 */ TChannel* field_0x8;
/* 0x0C */ TChannel* field_0xc;
/* 0x10 */ TChannel* field_0x10;
include/JSystem/JAudio/JASDSPChannel.h
+21 -12
View File
@@ -4,6 +4,8 @@
#include "dolphin/os/OSTime.h"
namespace JASystem {
class TChannel;
namespace DSPInterface {
class DSPBuffer;
}
@@ -38,28 +40,35 @@ namespace JASystem {
static int getNumBreak();
u8 getNumber() { return mNumber; }
u8 getPriority() { return mPriority; }
void setPriority(u8 priority) { mPriority = priority; }
u16 getPriorityTime() { return mPriorityTime; }
void setPriorityTime(u16 time) { mPriorityTime = time; }
u16 getCBInterval() { return mCBInterval; }
void setCBInterval(u16 interval) { mCBInterval = interval; }
void decCBInterval() { mCBInterval--; }
TChannel* getLogicalChannel() {
if (mCallback != NULL) {
return (TChannel*)field_0x8; // ?? is this userdata?
} else {
return NULL;
}
}
// TODO: inlines
void checkSign(u32) {}
void isFree() {}
void getPriority() {}
void getStatus() {}
void getCBInterval() {}
void decCBInterval() {}
void getPriorityTime() {}
void setCBInterval(u16) {}
void setPriorityTime(u16) {}
void setPriority(u8) {}
void getLogicalChannel() {}
void forceStop(TDSPChannel*) {}
void release(TDSPChannel*, u32) {}
/* 0x00 */ u8 mNumber;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3;
/* 0x04 */ u16 field_0x4;
/* 0x06 */ u16 field_0x6;
/* 0x08 */ int field_0x8;
/* 0x03 */ u8 mPriority;
/* 0x04 */ u16 mPriorityTime;
/* 0x06 */ u16 mCBInterval;
/* 0x08 */ u32 field_0x8;
/* 0x0C */ DSPInterface::DSPBuffer* field_0xc;
/* 0x10 */ int (*mCallback)(TDSPChannel*, u32);
include/JSystem/JAudio/JASDSPInterface.h
+3 -1
View File
@@ -8,13 +8,15 @@ namespace JASystem {
struct Wave_ {
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2[0x10 - 0x2];
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3[0x10 - 0x3];
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ int field_0x18;
/* 0x1C */ int field_0x1c;
/* 0x20 */ short field_0x20;
/* 0x22 */ short field_0x22;
/* 0x24 */ u32* field_0x24;
};
}
namespace DSPInterface {
include/JSystem/JAudio/JASDriverIF.h
+18 -3
View File
@@ -6,9 +6,9 @@
namespace JASystem {
namespace Driver {
struct PanMatrix_ {
/* 0x00 */ f32 field_0x0;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x00 */ f32 mSound;
/* 0x04 */ f32 mEffect;
/* 0x08 */ f32 mChannel;
};
void init();
@@ -19,6 +19,21 @@ namespace JASystem {
u32 getOutputMode();
u8 getUpdateInterval();
inline f32 Clamp01(f32 value) {
if (value <= 0.0f) {
return 0.0f;
}
if (value >= 1.0f) {
return 1.0f;
}
return value;
}
// TODO
inline void getMixerLevel() {}
extern u8 calc_sw_table[][3];
extern u16 MAX_MIXERLEVEL;
extern u16 MAX_AUTOMIXERLEVEL;
extern u32 JAS_SYSTEM_OUTPUT_MODE;
include/d/actor/d_a_leaflift.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
public:
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel;
/* 0x29C */ dCcD_Stts mStts;
/* 0x29C */ dCcD_Stts mStts;
/* 0x2D8 */ dCcD_Cyl mCyl;
/* 0x408 */ dBgW* mpBgW;
/* 0x40C */ Mtx mMtx;
include/f_op/f_op_actor_mng.h
+1 -1
View File
@@ -554,7 +554,7 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, s16 eventIdx, u16 flag, u16 hi
s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, fopAc_ac_c* i_partner, s16 eventIdx, u16 flag, u16 hind);
s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventIdx, u8 mapToolID = -1, u16 hind = -1,
u16 priority = 0, u16 flag = 1);
s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16);
s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16 flag, u16 hind, u16 priority);
s32 fopAcM_orderItemEvent(fopAc_ac_c*);
s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*);
fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*);
src/JSystem/JAudio/JASBankMgr.cpp
+7 -7
View File
@@ -29,7 +29,7 @@ void JASystem::BankMgr::init(int param_1) {
JUT_ASSERT(72, sVir2PhyTable != NULL);
Calc::bzero(sBankArray, r31);
for (int i = 0; i < param_1; i++) {
sVir2PhyTable[i] = 0xffffffff;
sVir2PhyTable[i] = 0xFFFF;
}
sTableSize = param_1;
}
@@ -134,12 +134,12 @@ JASystem::TChannel* JASystem::BankMgr::noteOnOsc(TChannelMgr* param_1, int param
channel->field_0x54 = 1.0f;
channel->field_0x5c = channel->field_0x0 / 127.0f;
channel->field_0x5c = channel->field_0x54 * (channel->field_0x5c * channel->field_0x5c);
channel->field_0x70.field_0x0 = 0.5f;
channel->field_0x7c.field_0x0 = 0.0f;
channel->field_0x88.field_0x0 = 0.0f;
channel->field_0x70.field_0x4 = 0.5f;
channel->field_0x7c.field_0x4 = 0.0f;
channel->field_0x88.field_0x4 = 0.0f;
channel->mPanVec.mSound = 0.5f;
channel->mFxmixVec.mSound = 0.0f;
channel->mDolbyVec.mSound = 0.0f;
channel->mPanVec.mEffect = 0.5f;
channel->mFxmixVec.mEffect = 0.0f;
channel->mDolbyVec.mEffect = 0.0f;
channel->field_0x94 = 1.0f;
channel->field_0x98 = 1.0f;
channel->setOscInit(0, &OSC_ENV);
src/JSystem/JAudio/JASChAllocQueue.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ void JASystem::TDSPQueue::deQueue() {
r31--;
continue;
}
if (TDSPChannel::breakLower(channel->field_0x48)) {
if (TDSPChannel::breakLower(channel->getNoteOnPriority())) {
continue;
}
channel->field_0x28(channel, 6);
src/JSystem/JAudio/JASChannel.cpp
+640 -93
View File
@@ -4,17 +4,66 @@
//
#include "JSystem/JAudio/JASChannel.h"
#include "JSystem/JAudio/JASCalc.h"
#include "JSystem/JAudio/JASChAllocQueue.h"
#include "JSystem/JAudio/JASChGlobal.h"
#include "JSystem/JAudio/JASChannelMgr.h"
#include "JSystem/JAudio/JASDSPChannel.h"
#include "JSystem/JAudio/JASDSPInterface.h"
#include "JSystem/JAudio/JASDriverTables.h"
#include "JSystem/JAudio/JASDriverIF.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
namespace JASystem {
enum CalcSource {
CALC_Sound = 0,
CALC_Effect = 1,
CALC_Channel = 2,
};
enum CalcStyle {
CALC_NONE = 0, // don't add that component
CALC_ADD = 1, // simply add that component
CALC_WEIGHT = 2, // add component weighted by power
};
u8 Driver::calc_sw_table[27][3] = {
// sound, effect, channel
{ CALC_NONE, CALC_NONE, CALC_NONE }, // 0, null
{ CALC_NONE, CALC_NONE, CALC_ADD }, // 1, add only channel
{ CALC_NONE, CALC_NONE, CALC_ADD }, // 2, add only channel
{ CALC_NONE, CALC_ADD, CALC_NONE }, // 3, add only effect
{ CALC_NONE, CALC_ADD, CALC_ADD }, // 4, add effect and channel
{ CALC_NONE, CALC_ADD, CALC_WEIGHT }, // 5, add effect, weight channel
{ CALC_NONE, CALC_ADD, CALC_NONE }, // 6, add only effect
{ CALC_NONE, CALC_WEIGHT, CALC_ADD }, // 7, weight effect, add channel
{ CALC_NONE, CALC_WEIGHT, CALC_WEIGHT }, // 8, weight effect and channel
{ CALC_ADD, CALC_NONE, CALC_NONE }, // 9, add only sound
{ CALC_ADD, CALC_NONE, CALC_ADD }, // 10, add sound and channel
{ CALC_ADD, CALC_NONE, CALC_WEIGHT }, // 11, add sound, weight channel
{ CALC_ADD, CALC_ADD, CALC_NONE }, // 12, add sound and effect
{ CALC_ADD, CALC_ADD, CALC_ADD }, // 13, add all
{ CALC_ADD, CALC_ADD, CALC_WEIGHT }, // 14, add sound and effect, weight channel
{ CALC_ADD, CALC_WEIGHT, CALC_NONE }, // 15, add sound, weight effect
{ CALC_ADD, CALC_WEIGHT, CALC_ADD }, // 16, add sound and channel, weight effect
{ CALC_ADD, CALC_WEIGHT, CALC_WEIGHT }, // 17, add sound, weight effect and channel
{ CALC_ADD, CALC_NONE, CALC_NONE }, // 18, add only sound
{ CALC_WEIGHT, CALC_NONE, CALC_ADD }, // 19, weight sound, add channel
{ CALC_WEIGHT, CALC_NONE, CALC_WEIGHT }, // 20, weight sound and channel
{ CALC_WEIGHT, CALC_ADD, CALC_NONE }, // 21, weight sound, add effect
{ CALC_WEIGHT, CALC_ADD, CALC_ADD }, // 22, weight sound, add effect and channel
{ CALC_WEIGHT, CALC_ADD, CALC_WEIGHT }, // 23, weight sound and channel, weight effect
{ CALC_WEIGHT, CALC_WEIGHT, CALC_NONE }, // 24, weight sound and effect
{ CALC_WEIGHT, CALC_WEIGHT, CALC_ADD }, // 25, weight sound and effect, add channel
{ CALC_WEIGHT, CALC_WEIGHT, CALC_WEIGHT }, // 26, weight all
};
/* 8028B3E8-8028B5A4 .text init__Q28JASystem8TChannelFv */
void JASystem::TChannel::init() {
field_0x28 = 0;
field_0x2c = 0;
void TChannel::init() {
field_0x28 = NULL;
field_0x2c = NULL;
field_0x30 = 0;
field_0x34 = 0;
field_0x10 = NULL;
@@ -24,25 +73,25 @@ void JASystem::TChannel::init() {
field_0x1c = 0;
field_0xd4 = 0;
if (!field_0x4) {
field_0xb0[0] = 0x150;
field_0xb0[1] = 0x210;
field_0xb0[2] = 0x352;
field_0xb0[3] = 0x412;
field_0xb0[4] = 0;
field_0xb0[5] = 0;
mMixConfigs[0].mWhole = 0x150;
mMixConfigs[1].mWhole = 0x210;
mMixConfigs[2].mWhole = 0x352;
mMixConfigs[3].mWhole = 0x412;
mMixConfigs[4].mWhole = 0;
mMixConfigs[5].mWhole = 0;
field_0x48 = 0x10101;
field_0x4c = 600;
field_0x60[0] = 0x1a;
field_0x60[1] = 1;
field_0x60[2] = 1;
mCalcTypes[0] = CALC_WeightAll; // Pan
mCalcTypes[1] = CALC_AddChannelOnly; // FxMix
mCalcTypes[2] = CALC_AddChannelOnly;
} else {
for (int i = 0; i < 6; i++) {
field_0xb0[i] = field_0x4->field_0x4e[i];
mMixConfigs[i].mWhole = field_0x4->field_0x4e[i];
}
field_0x48 = field_0x4->field_0x68;
field_0x4c = field_0x4->field_0x6c;
for (int i = 0; i < 3; i++) {
field_0x60[i] = field_0x4->mCalcTypes[i];
mCalcTypes[i] = field_0x4->mCalcTypes[i];
}
}
for (u32 i = 0; i < 4; i++) {
@@ -59,68 +108,84 @@ void JASystem::TChannel::init() {
}
/* 8028B5A4-8028B620 .text setOscillator__Q28JASystem8TChannelFUlPQ28JASystem11TOscillator */
void JASystem::TChannel::setOscillator(u32 oscnum, TOscillator* param_2) {
void TChannel::setOscillator(u32 oscnum, TOscillator* param_2) {
JUT_ASSERT(173, oscnum < (4));
osc[oscnum] = param_2;
}
/* 8028B620-8028B6A8 .text setOscInit__Q28JASystem8TChannelFUlPCQ38JASystem11TOscillator4Osc_ */
void JASystem::TChannel::setOscInit(u32 oscnum, const TOscillator::Osc_* param_2) {
void TChannel::setOscInit(u32 oscnum, const TOscillator::Osc_* param_2) {
JUT_ASSERT(183, oscnum < (4));
osc[oscnum]->setOsc(param_2);
osc[oscnum]->initStart();
}
/* 8028B6A8-8028B73C .text forceStopOsc__Q28JASystem8TChannelFUl */
bool JASystem::TChannel::forceStopOsc(u32 numosc) {
/* Nonmatching */
bool TChannel::forceStopOsc(u32 numosc) {
JUT_ASSERT(195, numosc < (4));
return osc[numosc]->isOsc() ? osc[numosc]->forceStop() : false;
}
/* 8028B73C-8028B7D0 .text releaseOsc__Q28JASystem8TChannelFUl */
bool JASystem::TChannel::releaseOsc(u32 numosc) {
/* Nonmatching */
bool TChannel::releaseOsc(u32 numosc) {
JUT_ASSERT(209, numosc < (4));
return osc[numosc]->isOsc() ? osc[numosc]->release() : false;
}
/* 8028B7D0-8028B850 .text directReleaseOsc__Q28JASystem8TChannelFUlUs */
void JASystem::TChannel::directReleaseOsc(u32 oscnum, u16 param_2) {
void TChannel::directReleaseOsc(u32 oscnum, u16 param_2) {
JUT_ASSERT(224, oscnum < (4));
osc[oscnum]->releaseDirect(param_2);
}
/* 8028B850-8028B8E4 .text bankOscToOfs__Q28JASystem8TChannelFUl */
f32 JASystem::TChannel::bankOscToOfs(u32 oscnum) {
/* Nonmatching */
f32 TChannel::bankOscToOfs(u32 oscnum) {
JUT_ASSERT(234, oscnum < (4));
// Probably uses inline JASystem::TOscillator::bankOscToOfs
return osc[oscnum]->isOsc() ? osc[oscnum]->getOffset() : 1.0f;
}
/* 8028B8E4-8028BA98 .text effectOsc__Q28JASystem8TChannelFUlf */
void JASystem::TChannel::effectOsc(u32 oscnum, f32 param_2) {
/* Nonmatching */
void TChannel::effectOsc(u32 oscnum, f32 effect) {
JUT_ASSERT(246, oscnum < (4));
switch (osc[oscnum]->getOsc()->field_0x0) {
case 1:
field_0x94 *= effect;
break;
case 0:
field_0x98 *= effect;
break;
case 2:
effect -= 0.5; // Must be double literal to match
mPanVec.mEffect += effect;
mPanVec.mEffect = Driver::Clamp01(mPanVec.mEffect);
break;
case 3:
mFxmixVec.mEffect += effect;
mFxmixVec.mEffect = Driver::Clamp01(mFxmixVec.mEffect);
break;
case 4:
mDolbyVec.mEffect += effect;
mDolbyVec.mEffect = Driver::Clamp01(mDolbyVec.mEffect);
break;
}
}
/* 8028BA98-8028BB14 .text getOscState__Q28JASystem8TChannelCFUl */
int JASystem::TChannel::getOscState(u32 oscnum) const {
/* Nonmatching */
u8 TChannel::getOscState(u32 oscnum) const {
JUT_ASSERT(274, oscnum < (4));
return osc[oscnum]->mState;
}
/* 8028BB14-8028BB98 .text isOsc__Q28JASystem8TChannelFUl */
BOOL JASystem::TChannel::isOsc(u32 oscnum) {
/* Nonmatching */
BOOL TChannel::isOsc(u32 oscnum) {
JUT_ASSERT(284, oscnum < (4));
return osc[oscnum]->isOsc();
}
/* 8028BB98-8028BC78 .text copyOsc__Q28JASystem8TChannelFUlPQ38JASystem11TOscillator4Osc_ */
void JASystem::TChannel::copyOsc(u32 oscnum, TOscillator::Osc_* param_2) {
/* Nonmatching */
void TChannel::copyOsc(u32 oscnum, TOscillator::Osc_* param_2) {
JUT_ASSERT(295, oscnum < (4));
if (isOsc(oscnum)) {
*param_2 = *osc[oscnum]->getOsc();
@@ -130,44 +195,64 @@ void JASystem::TChannel::copyOsc(u32 oscnum, TOscillator::Osc_* param_2) {
}
/* 8028BC78-8028BD10 .text overwriteOsc__Q28JASystem8TChannelFUlPQ38JASystem11TOscillator4Osc_ */
void JASystem::TChannel::overwriteOsc(u32 oscnum, TOscillator::Osc_* param_2) {
void TChannel::overwriteOsc(u32 oscnum, TOscillator::Osc_* param_2) {
JUT_ASSERT(308, oscnum < (4));
setOscInit(oscnum, param_2);
effectOsc(oscnum, bankOscToOfs(oscnum));
}
/* 8028BD10-8028BDA4 .text setKeySweepTarget__Q28JASystem8TChannelFUcUl */
void JASystem::TChannel::setKeySweepTarget(u8, u32) {
/* Nonmatching */
void TChannel::setKeySweepTarget(u8 key, u32 target) {
s32 r0;
if (field_0xc == 2 || field_0x10 == 0)
r0 = key;
else
r0 = key + 0x3C - field_0x10->field_0x2;
if (r0 < 0)
r0 = 0;
else if (r0 > 0x7F)
r0 = 0x7F;
f32 val = Driver::C5BASE_PITCHTABLE[r0];
val *= field_0x50;
if (target == 0) {
field_0x58 = val;
field_0x2c = NULL;
return;
}
field_0x9c = val;
field_0xa2 = target;
field_0x2c = &TChannel::extraUpdate;
}
/* 8028BDA4-8028BDAC .text setPauseFlag__Q28JASystem8TChannelFUc */
void JASystem::TChannel::setPauseFlag(u8 param_1) {
void TChannel::setPauseFlag(u8 param_1) {
mPauseFlag = param_1;
}
/* 8028BDAC-8028BDBC .text setPauseFlagReq__Q28JASystem8TChannelFUc */
void JASystem::TChannel::setPauseFlagReq(u8 param_1) {
void TChannel::setPauseFlagReq(u8 param_1) {
mPauseFlag = param_1;
field_0x3 = 1;
}
/* 8028BDBC-8028BE64 .text setPanPower__Q28JASystem8TChannelFffff */
void JASystem::TChannel::setPanPower(f32 param_1, f32 param_2, f32 param_3, f32 param_4) {
/* Nonmatching */
void TChannel::setPanPower(f32 param_1, f32 param_2, f32 param_3, f32 param_4) {
f32 px = param_1 + param_2 + param_3;
if (px == 0.0f) {
OSReport("----- JASChannel::setPanPower : px == 0.0\n");
px = 1.0f;
}
field_0x64.field_0x0 = param_1 / px;
field_0x64.field_0x4 = param_2 / px;
field_0x64.field_0x8 = param_3 / px;
mPanPower.mSound = param_1 / px;
mPanPower.mEffect = param_2 / px;
mPanPower.mChannel = param_3 / px;
}
/* 8028BE64-8028BEB8 .text checkLogicalChannel__Q28JASystem8TChannelFv */
BOOL JASystem::TChannel::checkLogicalChannel() {
/* Nonmatching */
BOOL TChannel::checkLogicalChannel() {
if (!field_0x10 && field_0xc == 0) {
OSReport("----- checkLC : 波形がアサインされていません\n");
return false;
@@ -176,8 +261,7 @@ BOOL JASystem::TChannel::checkLogicalChannel() {
}
/* 8028BEB8-8028BF40 .text play__Q28JASystem8TChannelFUl */
BOOL JASystem::TChannel::play(u32 param_1) {
/* Nonmatching */
BOOL TChannel::play(u32 param_1) {
if (param_1 == 0) {
param_1 = -1;
}
@@ -194,7 +278,7 @@ BOOL JASystem::TChannel::play(u32 param_1) {
}
/* 8028BF40-8028BFAC .text stop__Q28JASystem8TChannelFUs */
void JASystem::TChannel::stop(u16 param_1) {
void TChannel::stop(u16 param_1) {
if (!field_0x20) {
updatecallLogicalChannel(this, 6);
} else if (param_1 == 0) {
@@ -206,21 +290,20 @@ void JASystem::TChannel::stop(u16 param_1) {
}
/* 8028BFAC-8028C108 .text updateJcToDSP__Q28JASystem8TChannelFv */
void JASystem::TChannel::updateJcToDSP() {
/* Nonmatching */
void TChannel::updateJcToDSP() {
DSPInterface::DSPBuffer* dspBuffer = field_0x20->field_0xc;
if (field_0xd4) {
for (u8 i = 0; i < 6; i++) {
dspBuffer->setMixerVolumeOnly(i, field_0xbc[i]);
}
dspBuffer->setPitch(field_0xa0);
dspBuffer->setPitch(mPitch);
dspBuffer->setPauseFlag(mPauseFlag);
dspBuffer->flushChannel();
} else {
for (u8 i = 0; i < 6; i++) {
dspBuffer->setMixerVolume(i, field_0xbc[i], field_0x4->field_0x5a[i]);
}
dspBuffer->setPitch(field_0xa0);
dspBuffer->setPitch(mPitch);
if (field_0x4->field_0x61 & 0x20) {
dspBuffer->setIIRFilterParam(field_0x4->field_0x3c);
}
@@ -235,7 +318,7 @@ void JASystem::TChannel::updateJcToDSP() {
}
/* 8028C108-8028C140 .text forceStopLogicalChannel__Q28JASystem8TChannelFv */
bool JASystem::TChannel::forceStopLogicalChannel() {
bool TChannel::forceStopLogicalChannel() {
if (!field_0x20) {
return false;
}
@@ -244,77 +327,541 @@ bool JASystem::TChannel::forceStopLogicalChannel() {
}
/* 8028C140-8028C1C0 .text stopLogicalChannel__Q28JASystem8TChannelFv */
bool JASystem::TChannel::stopLogicalChannel() {
/* Nonmatching */
BOOL TChannel::stopLogicalChannel() {
if (!field_0x20) {
OSReport("----- stopLC : DSP Ch is not assigned\n");
return false;
return FALSE;
}
field_0x20->mCallback = NULL;
field_0x20->field_0x6 = 0;
field_0x20->setCBInterval(0);
field_0x20->stop();
TDSPChannel::free(field_0x20, u32(this));
field_0x20 = NULL;
return true;
return TRUE;
}
/* 8028C1C0-8028C3A8 .text playLogicalChannel__Q28JASystem8TChannelFv */
int JASystem::TChannel::playLogicalChannel() {
/* Nonmatching */
BOOL TChannel::playLogicalChannel() {
if (!field_0x20) {
OSReport("----- playLC DSP Ch が割当てられていません\n");
return FALSE;
}
if (!checkLogicalChannel())
return FALSE;
field_0x20->mCallback = &TChannel::updatecallDSPChannel;
field_0x20->setCBInterval(1);
DSPInterface::DSPBuffer* buf = field_0x20->field_0xc;
switch (field_0xc) {
case 0:
buf->setWaveInfo(field_0x10, field_0x14, field_0xe8);
break;
case 2:
buf->setOscInfo(field_0x14);
break;
}
for (u8 i = 0; i < 6; ++i) {
// Something ungodly is occurring here.
union {
u16 asS16;
struct {
u8 hi;
u8 lo;
} asP;
} s;
s.asS16 = mMixConfigs[i].mWhole;
u32 om = Driver::getOutputMode();
if (om == 0) {
switch (s.asP.hi) {
case 8:
s.asP.hi = 0xB;
break;
case 9:
s.asP.hi = 0x2;
break;
}
} else if (om == 1) {
if (s.asP.hi == 8)
s.asP.hi = 0xB;
}
buf->setBusConnect(i, s.asP.hi);
}
field_0xa4 = field_0x4;
for (u32 i = 0; i < 4; ++i) {
if (isOsc(i)) {
effectOsc(i, bankOscToOfs(i));
}
}
updateEffectorParam();
updateJcToDSPInit();
field_0x20->setPriority(field_0x48);
field_0x20->setPriorityTime(field_0x4c);
field_0x20->play();
return TRUE;
}
/* 8028C3A8-8028C62C .text updateEffectorParam__Q28JASystem8TChannelFv */
void JASystem::TChannel::updateEffectorParam() {
/* Nonmatching */
}
void TChannel::updateEffectorParam() {
f32 pan;
f32 fxmix;
f32 dolby = 0.0f;
/* 8028C62C-8028C6C4 .text killBrokenLogicalChannels__Q28JASystem8TChannelFPQ28JASystem11TDSPChannel */
void JASystem::TChannel::killBrokenLogicalChannels(TDSPChannel*) {
/* Nonmatching */
}
if (field_0xa4 == field_0x4) {
field_0xa8 = field_0x4->field_0x1c;
field_0xac = field_0x4->field_0x18;
mPanVec.mChannel = field_0x4->field_0x20;
mFxmixVec.mChannel = field_0x4->field_0x24;
mDolbyVec.mChannel = field_0x4->field_0x28;
for (int i = 0; i < 3; i++) {
mCalcTypes[i] = field_0x4->mCalcTypes[i];
}
}
/* 8028C6C4-8028CABC .text updatecallDSPChannel__Q28JASystem8TChannelFPQ28JASystem11TDSPChannelUl */
void JASystem::TChannel::updatecallDSPChannel(TDSPChannel*, u32) {
/* Nonmatching */
}
switch (Driver::getOutputMode()) {
case 0:
pan = 0.5f;
dolby = 0.0f;
fxmix = calcEffect(&mFxmixVec, &mPanPower, mCalcTypes[1]);
break;
case 1:
pan = (mCalcTypes[0] == CALC_None) ? 0.5f : calcPan(&mPanVec, &mPanPower, mCalcTypes[0]);
fxmix = calcEffect(&mFxmixVec, &mPanPower, mCalcTypes[1]);
dolby = 0.0f;
break;
case 2:
pan = (mCalcTypes[0] == CALC_None) ? 0.5f : calcPan(&mPanVec, &mPanPower, mCalcTypes[0]);
fxmix = calcEffect(&mFxmixVec, &mPanPower, mCalcTypes[1]);
dolby = calcEffect(&mDolbyVec, &mPanPower, mCalcTypes[2]);
break;
}
/* 8028CABC-8028CB88 .text calcEffect__Q28JASystem8TChannelFPCQ38JASystem6Driver10PanMatrix_PCQ38JASystem6Driver10PanMatrix_Uc */
f32 JASystem::TChannel::calcEffect(const Driver::PanMatrix_*, const JASystem::Driver::PanMatrix_*, u8) {
/* Nonmatching */
}
f32 volume = field_0xac * (field_0x5c * field_0x98);
/* 8028CB88-8028CC90 .text calcPan__Q28JASystem8TChannelFPCQ38JASystem6Driver10PanMatrix_PCQ38JASystem6Driver10PanMatrix_Uc */
f32 JASystem::TChannel::calcPan(const Driver::PanMatrix_*, const Driver::PanMatrix_*, u8) {
/* Nonmatching */
}
pan = Driver::Clamp01(pan);
fxmix = Driver::Clamp01(fxmix);
dolby = Driver::Clamp01(dolby);
/* 8028CC90-8028CD90 .text updateJcToDSPInit__Q28JASystem8TChannelFv */
void JASystem::TChannel::updateJcToDSPInit() {
/* Nonmatching */
JASystem::DSPInterface::DSPBuffer * pBuffer = field_0x20->field_0xc;
if (pBuffer->field_0xb0[0] == 0xFFFF) {
pBuffer->initAutoMixer();
pBuffer->setMixerInitDelayMax(field_0x4->field_0x60);
mPitch = 4096.0f * (field_0xa8 * (field_0x58 * field_0x94));
if (mMixConfigs[0].mWhole != 0xFFFF) {
updateMixer(volume, pan, fxmix, dolby);
} else {
updateAutoMixer(volume, pan, fxmix, dolby);
}
}
/* 8028C62C-8028C6C4 .text killBrokenLogicalChannels__Q28JASystem8TChannelFPQ28JASystem11TDSPChannel */
void TChannel::killBrokenLogicalChannels(TDSPChannel* dspChannel) {
TChannelMgr* mgr;
for (u32 i = 0; i < 256; i++) {
TChannel* channel = TGlobalChannel::getChannelHandle(i);
if (channel == NULL) continue;
if (channel->field_0x20 != dspChannel) continue;
mgr = channel->field_0x4;
if (mgr == NULL) continue;
channel->stopLogicalChannel();
if (!mgr->moveListHead(channel, 0)) {
OSReport("----- killBrokenLogicalChannels : Cutできない\n");
}
}
}
/* 8028C6C4-8028CABC .text updatecallDSPChannel__Q28JASystem8TChannelFPQ28JASystem11TDSPChannelUl */
int TChannel::updatecallDSPChannel(TDSPChannel* dspChannel, u32 param_2) {
TChannel* channel = dspChannel->getLogicalChannel();
TChannelMgr* mgr = channel->field_0x4;
u32 i;
u32 r27 = 0;
if (channel == NULL) {
OSReport("-----Error JASDriver::commonCallbackLC DSPchのsignがNULL\n");
dspChannel->mCallback = NULL;
dspChannel->mPriority = 0;
killBrokenLogicalChannels(dspChannel);
return 0;
}
if (channel->field_0x20 != dspChannel) {
if (channel->field_0x20 != NULL && channel == channel->field_0x20->getLogicalChannel()) {
killBrokenLogicalChannels(dspChannel);
} else {
channel->stopLogicalChannel();
if (!mgr->moveListHead(channel, 0)) {
OSReport("----- updatecallDSPChannel : Cutできない\n");
}
}
dspChannel->forceDelete();
return 0;
} else {
if (param_2 == 2) {
if (channel->field_0x28 != NULL) {
channel->field_0x28(channel, 1);
} else {
channel->stopLogicalChannel();
if (!mgr->moveListHead(channel, 0)) {
OSReport("----- updatecallDSPChannel : Cutできない\n");
}
}
return 0;
}
if (channel->field_0x10 != NULL && channel->field_0x10->field_0x24[0] == 0) {
dspChannel->forceStop();
return -1;
}
if (param_2 == 4) {
u8 priority = channel->getLifeTimePriority();
if (channel->field_0x20 != NULL) {
if (priority < channel->field_0x20->getPriority()) {
channel->field_0x20->setPriority(priority);
}
}
return 0;
}
if (param_2 == 3) {
channel->forceStopOsc(0);
if (!mgr->moveListHead(channel, 3)) {
OSReport("----- updatecallDSPChannel : Cutできない\n");
return 1;
}
param_2 = 0;
}
if (param_2 == 0) {
channel->field_0x94 = 1.0f;
channel->field_0x98 = 1.0f;
channel->mPanVec.mEffect = 0.5f;
channel->mFxmixVec.mEffect = 0.0f;
channel->mDolbyVec.mEffect = 0.0f;
for (i = 0; i < 4; i++) {
if (!channel->isOsc(i)) continue;
channel->effectOsc(i, channel->bankOscToOfs(i));
if (i == 0 && channel->getOscState(i) == 0) {
if (channel->field_0x28 == NULL) {
OSReport("----- updatecallDSPCh JC停止のためのUPDATECALLがNULL\n");
if (!channel->stopLogicalChannel()) {
dspChannel->stop();
}
if (!mgr->moveListHead(channel, 0)) {
OSReport("----- updatecallDSPChannel : Cutできない update\n");
}
return 0;
}
channel->field_0x28(channel, 2);
return 0;
}
r27++;
}
if (r27 != 0) {
channel->updateEffectorParam();
channel->field_0x3 = 1;
}
if (channel->field_0x2c != NULL) {
if (channel->field_0x2c(channel, 0) == 1) {
channel->field_0x3++;
}
}
u8 updateInterval = Driver::getUpdateInterval();
if (channel->field_0x28 == NULL) {
return updateInterval;
}
if (channel->field_0x34 > 0) {
if (channel->field_0x34 > updateInterval) {
channel->field_0x34 -= updateInterval;
} else {
channel->field_0x34 = 0;
}
}
}
if (channel->field_0x34 == 0) {
channel->field_0x28(channel, 0);
channel->field_0x34 = channel->field_0x30;
}
if (channel->field_0x3 != 0) {
channel->updateJcToDSP();
channel->field_0x3 = 0;
}
return Driver::getUpdateInterval();
}
dspChannel->forceDelete();
}
/* 8028CABC-8028CB88 .text calcEffect__Q28JASystem8TChannelFPCQ38JASystem6Driver10PanMatrix_PCQ38JASystem6Driver10PanMatrix_Uc */
f32 TChannel::calcEffect(const Driver::PanMatrix_* params, const Driver::PanMatrix_* power, u8 calcType) {
f32 value = 0.0f;
const u8* calcTypes = Driver::calc_sw_table[calcType];
switch (calcTypes[CALC_Sound]) {
case CALC_NONE:
break;
case CALC_ADD:
value += params->mSound;
break;
case CALC_WEIGHT:
value += params->mSound * power->mSound;
break;
}
switch (calcTypes[CALC_Effect]) {
case CALC_NONE:
break;
case CALC_ADD:
value += params->mEffect;
break;
case CALC_WEIGHT:
value += params->mEffect * power->mEffect;
break;
}
switch (calcTypes[CALC_Channel]) {
case CALC_NONE:
break;
case CALC_ADD:
value += params->mChannel;
break;
case CALC_WEIGHT:
value += params->mChannel * power->mChannel;
break;
}
return value;
}
/* 8028CB88-8028CC90 .text calcPan__Q28JASystem8TChannelFPCQ38JASystem6Driver10PanMatrix_PCQ38JASystem6Driver10PanMatrix_Uc */
f32 TChannel::calcPan(const Driver::PanMatrix_* params, const Driver::PanMatrix_* power, u8 calcType) {
f32 value = 0.0f;
const u8* calcTypes = Driver::calc_sw_table[calcType];
switch (calcTypes[CALC_Sound]) {
case CALC_NONE:
break;
case CALC_ADD:
value += (params->mSound - 0.5f);
break;
case CALC_WEIGHT:
value += (params->mSound - 0.5f) * power->mSound;
break;
}
switch (calcTypes[CALC_Effect]) {
case CALC_NONE:
break;
case CALC_ADD:
value += (params->mEffect - 0.5f);
break;
case CALC_WEIGHT:
value += (params->mEffect - 0.5f) * power->mEffect;
break;
}
switch (calcTypes[CALC_Channel]) {
case CALC_NONE:
break;
case CALC_ADD:
value += (params->mChannel - 0.5f);
break;
case CALC_WEIGHT:
value += (params->mChannel - 0.5f) * power->mChannel;
break;
}
value += 0.5f;
return value;
}
/* 8028CC90-8028CD90 .text updateJcToDSPInit__Q28JASystem8TChannelFv */
void TChannel::updateJcToDSPInit() {
DSPInterface::DSPBuffer* buf = field_0x20->field_0xc;
if (mMixConfigs[0].mWhole == 0xFFFF) {
field_0x20->field_0xc->initAutoMixer();
} else {
buf->setMixerInitDelayMax(field_0x4->field_0x60);
for (u8 i = 0; i < 6; ++i)
buf->setMixerInitVolume(i, field_0xbc[i],
field_0x4->field_0x5a[i]);
}
buf->setPitch(mPitch);
if (field_0x4->field_0x61 & 0x20)
buf->setIIRFilterParam(field_0x4->field_0x3c);
if (field_0x4->field_0x61 & 0x1F)
buf->setFIR8FilterParam(field_0x4->field_0x2c);
buf->setFilterMode(field_0x4->field_0x61);
buf->setPauseFlag(mPauseFlag);
}
/* 8028CD90-8028CEA8 .text updateAutoMixer__Q28JASystem8TChannelFffff */
void JASystem::TChannel::updateAutoMixer(f32 param_1, f32 param_2, f32 param_3, f32 param_4) {
f32 level = param_1 <= 0.0f ? 0.0f : param_1 >= 1.0f ? 1.0f : param_1;
field_0x20->field_0xc->setAutoMixer(level * Driver::getAutoLevel(), param_2 * 127.5f, param_4 * 127.5f, param_3 * 127.5f, field_0xb0[1]);
void TChannel::updateAutoMixer(f32 volume, f32 pan, f32 fxmix, f32 dolby) {
field_0x20->field_0xc->setAutoMixer(
Driver::Clamp01(volume) * Driver::getAutoLevel(),
pan * 127.5f, dolby * 127.5f, fxmix * 127.5f,
mMixConfigs[1].mWhole
);
}
/* 8028CEA8-8028D128 .text updateMixer__Q28JASystem8TChannelFffff */
void JASystem::TChannel::updateMixer(f32, f32, f32, f32) {
/* Nonmatching */
void TChannel::updateMixer(f32 volume, f32 pan, f32 fxmix, f32 dolby) {
for (u32 i = 0; i < 6; i++) {
f32 vol = volume;
MixConfig config = mMixConfigs[i];
if (config.mParts.u == 0) {
field_0xbc[i] = 0;
} else {
f32 scale;
if (config.mParts.l0 != 0) {
switch (config.mParts.l0) {
case 1:
scale = pan;
break;
case 2:
scale = fxmix;
break;
case 3:
scale = dolby;
break;
case 5:
scale = 1.0f - pan;
break;
case 6:
scale = 1.0f - fxmix;
break;
case 7:
scale = 1.0f - dolby;
break;
}
vol *= Calc::sinfT(scale);
}
if (config.mParts.l1 != 0) {
switch (config.mParts.l1) {
case 1:
scale = pan;
break;
case 2:
scale = fxmix;
break;
case 3:
scale = dolby;
break;
case 5:
scale = 1.0f - pan;
break;
case 6:
scale = 1.0f - fxmix;
break;
case 7:
scale = 1.0f - dolby;
break;
}
switch (config.mParts.l1) {
case 3:
case 7:
vol *= Calc::sinfDolby2(scale);
break;
default:
vol *= Calc::sinfT(scale);
break;
}
}
field_0xbc[i] = Driver::Clamp01(vol) * Driver::getChannelLevel();
}
}
}
/* 8028D128-8028D218 .text extraUpdate__Q28JASystem8TChannelFPQ28JASystem8TChannelUl */
void JASystem::TChannel::extraUpdate(TChannel*, u32) {
/* Nonmatching */
u32 TChannel::extraUpdate(TChannel* channel, u32) {
if (channel->field_0xa2 != 0) {
f32 f31 = channel->field_0x9c - channel->field_0x58;
u8 updateInterval = Driver::getUpdateInterval();
if (channel->field_0xa2 <= updateInterval) {
channel->field_0xa2 = 1;
}
f31 /= channel->field_0xa2;
channel->field_0x58 += f31 * updateInterval;
if ((channel->field_0xa2 - updateInterval) <= 0) {
channel->field_0xa2 = 0;
} else {
channel->field_0xa2 -= updateInterval;
}
if (channel->field_0xa2 == 0) {
channel->field_0x2c = NULL;
}
return 1;
} else {
return 0;
}
}
/* 8028D218-8028D3C0 .text updatecallLogicalChannel__Q28JASystem8TChannelFPQ28JASystem8TChannelUl */
void JASystem::TChannel::updatecallLogicalChannel(TChannel*, u32) {
/* Nonmatching */
BOOL TChannel::updatecallLogicalChannel(TChannel* channel, u32 param) {
TChannelMgr* mgr = channel->field_0x4;
if (param == 0) {
for (u32 i = 0; i < 4; ++i)
channel->releaseOsc(i);
if (channel->field_0x20)
channel->field_0x20->mPriority = channel->getReleasePriority();
if (!mgr->moveListTail(channel, 2)) {
OSReport("----- updatecallLC : CUT失敗(release)\n");
}
channel->field_0x30 = -1;
return FALSE;
} else if (param == 1 || param == 2 || param == 6) {
if (mgr->field_0x4 != 0) {
if (mgr->cutList(channel) == -1) {
OSReport("----- updatecallLC : CUT失敗(extra)\n");
} else {
--mgr->field_0x4;
if (u32 thing = channel->field_0xcc) {
channel->field_0xcc = 0;
mgr->checkLimitStop(channel, thing);
}
TGlobalChannel::release(channel);
}
} else {
int r29 = channel->field_0xcc;
if (!mgr->moveListHead(channel, 0)) {
OSReport("----- updatecallLC : CUT失敗(not extra)\n");
}
mgr->checkLimitStop(channel, r29);
}
if (param != 6)
channel->stopLogicalChannel();
else
TDSPQueue::deleteQueue(channel);
channel->field_0x1 = 0xFF;
channel->field_0x30 = 0xFFFFFFFF;
channel->field_0x28 = NULL;
}
return FALSE;
}
}; // namespace JASystem
src/JSystem/JAudio/JASChannelMgr.cpp
+6 -6
View File
@@ -84,21 +84,21 @@ JASystem::TChannel* JASystem::TChannelMgr::getLogicalChannel(u32) {
}
/* 8028D778-8028D7D8 .text moveListHead__Q28JASystem11TChannelMgrFPQ28JASystem8TChannelUl */
bool JASystem::TChannelMgr::moveListHead(TChannel* param_1, u32 param_2) {
BOOL JASystem::TChannelMgr::moveListHead(TChannel* param_1, u32 param_2) {
if (cutList(param_1) == -1) {
return false;
return FALSE;
}
addListHead(param_1, param_2);
return true;
return TRUE;
}
/* 8028D7D8-8028D838 .text moveListTail__Q28JASystem11TChannelMgrFPQ28JASystem8TChannelUl */
bool JASystem::TChannelMgr::moveListTail(TChannel* param_1, u32 param_2) {
BOOL JASystem::TChannelMgr::moveListTail(TChannel* param_1, u32 param_2) {
if (cutList(param_1) == -1) {
return false;
return FALSE;
}
addListTail(param_1, param_2);
return true;
return TRUE;
}
/* 8028D838-8028D8E4 .text addListHead__Q28JASystem11TChannelMgrFPQ28JASystem8TChannelUl */
src/JSystem/JAudio/JASDSPChannel.cpp
+16 -16
View File
@@ -18,10 +18,10 @@ void JASystem::TDSPChannel::init(u8 param_1) {
mNumber = param_1;
field_0x1 = 1;
field_0x8 = 0;
field_0x6 = 0;
mCBInterval = 0;
mCallback = NULL;
field_0x3 = 0;
field_0x4 = 0;
mPriority = 0;
mPriorityTime = 0;
field_0xc = DSPInterface::getDSPHandle(param_1);
}
@@ -36,7 +36,7 @@ int JASystem::TDSPChannel::allocate(u32 param_1) {
}
field_0x1 = 0;
field_0x8 = param_1;
field_0x3 = 1;
mPriority = 1;
field_0xc->allocInit();
return true;
}
@@ -44,7 +44,7 @@ int JASystem::TDSPChannel::allocate(u32 param_1) {
/* 80289720-8028973C .text free__Q28JASystem11TDSPChannelFv */
void JASystem::TDSPChannel::free() {
field_0x1 = 1;
field_0x3 = 0;
mPriority = 0;
mCallback = NULL;
field_0x8 = 0;
}
@@ -74,7 +74,7 @@ bool JASystem::TDSPChannel::forceStop() {
/* 802897E0-802897F4 .text forceDelete__Q28JASystem11TDSPChannelFv */
void JASystem::TDSPChannel::forceDelete() {
field_0x8 = 0;
field_0x3 = 0;
mPriority = 0;
mCallback = NULL;
}
@@ -166,7 +166,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::getLower() {
break;
}
if (dspch->mCallback) {
r27 = dspch->field_0x3;
r27 = dspch->mPriority;
if (r27 <= r31) {
JUT_ASSERT(305, i == dspch->getNumber());
if (r27 != r31 || dspch->field_0xc->field_0x10c >= r29) {
@@ -191,7 +191,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::getLowerActive() {
if (dspch->field_0x1 == 2 || dspch->field_0x1 == 1) {
continue;
}
u8 r30 = dspch->field_0x3;
u8 r30 = dspch->mPriority;
if (r30 <= r29) {
JUT_ASSERT(345, i == dspch->getNumber());
if (r30 != r29 || dspch->field_0xc->field_0x10c >= r27) {
@@ -207,7 +207,7 @@ JASystem::TDSPChannel* JASystem::TDSPChannel::getLowerActive() {
/* 80289D10-80289DC8 .text breakLower__Q28JASystem11TDSPChannelFUc */
BOOL JASystem::TDSPChannel::breakLower(u8 param_1) {
TDSPChannel* dspch = getLower();
if (dspch->field_0x3 > param_1) {
if (dspch->mPriority > param_1) {
return false;
}
if (dspch->field_0x1 != 1) {
@@ -227,7 +227,7 @@ BOOL JASystem::TDSPChannel::breakLower(u8 param_1) {
/* 80289DC8-80289E68 .text breakLowerActive__Q28JASystem11TDSPChannelFUc */
bool JASystem::TDSPChannel::breakLowerActive(u8 param_1) {
TDSPChannel* dspch = getLowerActive();
if (dspch->field_0x3 > param_1) {
if (dspch->mPriority > param_1) {
return false;
}
if (dspch->field_0x1 != 1) {
@@ -286,17 +286,17 @@ void JASystem::TDSPChannel::updateAll() {
}
if (dspBuffer->field_0x10a == 0) {
dspBuffer->field_0x10c++;
if (dspBuffer->field_0x10c == dspChannel->field_0x4 && dspChannel->mCallback) {
if (dspBuffer->field_0x10c == dspChannel->getPriorityTime() && dspChannel->mCallback) {
dspChannel->mCallback(dspChannel, 4);
}
}
if (dspChannel->mCallback) {
if (dspChannel->field_0x6) {
dspChannel->field_0x6--;
if (dspChannel->getCBInterval() != 0) {
dspChannel->decCBInterval();
}
if (dspChannel->field_0x6 == 0) {
if (dspChannel->getCBInterval() == 0) {
dspChannel->onUpdate(0);
if (dspChannel->field_0x6 == 0) {
if (dspChannel->getCBInterval() == 0) {
dspBuffer->field_0x2 = 0;
dspBuffer->field_0x0 = 0;
dspBuffer->flushChannel();
@@ -310,7 +310,7 @@ void JASystem::TDSPChannel::updateAll() {
/* 8028A04C-8028A08C .text onUpdate__Q28JASystem11TDSPChannelFUl */
void JASystem::TDSPChannel::onUpdate(u32 param_1) {
if (mCallback) {
field_0x6 = mCallback(this, param_1);
mCBInterval = mCallback(this, param_1);
}
}