PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and link synth_adsr.c 

Former-commit-id: 76898edb333b04c680a31d4a92620594491c46a9
This commit is contained in:
Phillip Stephens 2023-10-27 23:36:35 -07:00
parent 1fbb29656c
commit 4ad098d83e
2 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1187,7 +1187,7 @@ config.libs = [
Object(NonMatching, "musyx/runtime/synthmacros.c"),
Object(NonMatching, "musyx/runtime/synthvoice.c"),
Object(Matching, "musyx/runtime/synth_ac.c"),
Object(NonMatching, "musyx/runtime/synth_adsr.c"),
Object(Matching, "musyx/runtime/synth_adsr.c"),
Object(Matching, "musyx/runtime/synth_vsamples.c"),
Object(Matching, "musyx/runtime/synth_dbtab.c"),
Object(Matching, "musyx/runtime/s_data.c"),

85
src/musyx/runtime/synth_adsr.c
View File

@ -13,14 +13,95 @@ static u32 adsrGetIndex(ADSR_VARS* adsr) {
u32 adsrConvertTimeCents(long tc) { return 1000.f * powf(2.f, 1.2715658e-08f * tc); }
#pragma dont_inline on
u32 salChangeADSRState(ADSR_VARS* adsr) {
u32 VoiceDone; // r30
VoiceDone = FALSE;
switch (adsr->mode) {
case 0:
switch (adsr->state) {
case 0: {
if ((adsr->cnt = adsr->data.dls.aTime)) {
adsr->state = 1;
adsr->currentVolume = 0;
adsr->currentDelta = 0x7fff0000 / (adsr->data).dls.aTime;
goto done;
}
}
case 1: {
if ((adsr->cnt = adsr->data.dls.dTime)) {
adsr->state = 2;
adsr->currentVolume = 0x7fff0000;
adsr->currentDelta =
-((0x7fff0000 - (adsr->data.dls.sLevel * 0x10000)) / adsr->data.dls.dTime);
goto done;
}
}
case 2: {
if (adsr->data.dls.sLevel != 0) {
adsr->state = 3;
adsr->currentVolume = adsr->data.dls.sLevel << 0x10;
adsr->currentDelta = 0;
goto done;
}
}
case 4: {
break;
}
default:
goto done;
}
adsr->currentVolume = 0;
VoiceDone = TRUE;
break;
case 1:
switch (adsr->state) {
case 0: {
if ((adsr->cnt = adsr->data.dls.aTime)) {
adsr->state = 1;
if (adsr->data.dls.aMode == 0) {
adsr->currentVolume = 0;
adsr->currentDelta = 0x7fff0000 / adsr->cnt;
} else {
adsr->currentVolume = adsr->currentIndex = 0;
adsr->currentDelta = 0xc10000 / adsr->cnt;
}
goto done;
}
}
case 1: {
adsr->cnt = adsr->data.dls.dTime * (((0xc1u - adsr->data.dls.sLevel) * 0x10000) / 0xc1) >> 16;
if (adsr->cnt) {
adsr->state = 2;
adsr->currentVolume = 0x7fff0000;
adsr->currentIndex = 0xc10000;
adsr->currentDelta = -(((0xc1 - (uint)(adsr->data).dls.sLevel) * 0x10000) / adsr->cnt);
goto done;
}
}
case 2: {
if (adsr->data.dls.sLevel) {
adsr->state = 3;
adsr->currentIndex = adsr->data.dls.sLevel << 16;
adsr->currentVolume = dspAttenuationTab[adsrGetIndex(adsr)] << 16;
adsr->currentDelta = 0;
goto done;
}
break;
}
case 4: {
break;
}
default:
goto done;
}
adsr->currentVolume = 0;
VoiceDone = TRUE;
break;
}
done:
return VoiceDone;
}
#pragma dont_inline reset
u32 adsrSetup(ADSR_VARS* adsr) {
adsr->state = 0;