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

Match and link creverb.c 

Former-commit-id: e2c11d276b
This commit is contained in:
Phillip Stephens 2023-06-23 05:04:48 -07:00
parent 8ce5a2df0e
commit 9a1022d016
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -951,7 +951,7 @@ LIBS = [
["musyx/runtime/hw_dolphin", True], ["musyx/runtime/hw_dolphin", True],
["musyx/runtime/hw_memory", True], ["musyx/runtime/hw_memory", True],
["musyx/runtime/CheapReverb/creverb_fx", True], ["musyx/runtime/CheapReverb/creverb_fx", True],
["musyx/runtime/CheapReverb/creverb", False], ["musyx/runtime/CheapReverb/creverb", True],
["musyx/runtime/StdReverb/reverb_fx", True], ["musyx/runtime/StdReverb/reverb_fx", True],
["musyx/runtime/StdReverb/reverb", False], ["musyx/runtime/StdReverb/reverb", False],
["musyx/runtime/Delay/delay_fx", True], ["musyx/runtime/Delay/delay_fx", True],

2
include/musyx/musyx_priv.h
View File

@ -884,7 +884,7 @@ void synthSetBpm(u32 pbm, u8 set, u8 section);
void synthFXCloneMidiSetup(SYNTH_VOICE* dest, SYNTH_VOICE* src); void synthFXCloneMidiSetup(SYNTH_VOICE* dest, SYNTH_VOICE* src);
void synthSetMusicVolumeType(u8 vGroup, u8 type); void synthSetMusicVolumeType(u8 vGroup, u8 type);
extern u32 synthGlobalVariable[16]; extern long synthGlobalVariable[16];
extern u16 voicePrioSortRootListRoot; extern u16 voicePrioSortRootListRoot;
extern u8 voiceMusicRunning; extern u8 voiceMusicRunning;
extern u8 voiceFxRunning; extern u8 voiceFxRunning;

4
src/musyx/runtime/CheapReverb/creverb.c
View File

@ -21,7 +21,7 @@ static void DLsetdelay(_SND_REVSTD_DELAYLINE* dl, s32 lag) {
} }
static void DLcreate(_SND_REVSTD_DELAYLINE* dl, s32 len) { static void DLcreate(_SND_REVSTD_DELAYLINE* dl, s32 len) {
dl->length = len * sizeof(f32); dl->length = (s32)len * sizeof(f32);
dl->inputs = (f32*)salMalloc(len * sizeof(f32)); dl->inputs = (f32*)salMalloc(len * sizeof(f32));
memset(dl->inputs, 0, len * sizeof(len)); memset(dl->inputs, 0, len * sizeof(len));
dl->lastOutput = 0.f; dl->lastOutput = 0.f;
@ -62,7 +62,7 @@ bool ReverbSTDCreate(_SND_REVSTD_WORK* rv, float coloration, float time, float m
rv->level = mix; rv->level = mix;
rv->damping = damping; rv->damping = damping;
if (rv->damping < 0.05f) { if (rv->damping < 0.05f) {
rv->damping = 0.05; rv->damping = 0.05f;
} }
rv->damping = 1.f - (rv->damping * 0.8f + 0.05f); rv->damping = 1.f - (rv->damping * 0.8f + 0.05f);

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

@ -55,4 +55,11 @@ u32 adsrStartRelease(ADSR_VARS* adsr, u32 rtime) {
} }
u32 adsrRelease(ADSR_VARS* adsr) { u32 adsrRelease(ADSR_VARS* adsr) {
switch(adsr->mode) {
case 0:
case 1:
return adsrStartRelease(adsr, adsr->data.dls.rTime);
}
return FALSE;
} }