otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

XM import: loop + fade-out

Browse source 
and a couple envelope fixes
This commit is contained in:
tildearrow 2024-07-14 03:17:40 -05:00
parent b35db131c4
commit 8772d75e52
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/engine/fileOps/xm.cpp
View file

@ -87,7 +87,10 @@ void readEnvelope(DivInstrument* ins, int env, unsigned char flags, unsigned cha
} }
} }
if ((point+1)>=numPoints) { if ((point+1)>=numPoints) {
target->len=i; target->len=i-1;
if ((flags&4) && (!(flags&2))) {
target->rel=i-2;
}
//target->val[i]=p0; //target->val[i]=p0;
break; break;
} }
@ -527,11 +530,24 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
// add fade-out // add fade-out
if (volFade!=0) { if (volFade!=0) {
int cur=64; int cur=64;
int macroLen=ins->std.volMacro.len;
int curPos=ins->std.volMacro.len-1;
if (ins->std.volMacro.loop<macroLen) {
curPos=ins->std.volMacro.loop;
}
if (ins->std.volMacro.len>0) { if (ins->std.volMacro.len>0) {
cur=ins->std.volMacro.val[ins->std.volMacro.len-1]; cur=ins->std.volMacro.val[curPos];
} }
for (int fadeOut=32767; fadeOut>0 && ins->std.volMacro.len<254; fadeOut-=volFade) { for (int fadeOut=32767; fadeOut>0 && ins->std.volMacro.len<254; fadeOut-=volFade) {
cur=ins->std.volMacro.val[curPos];
ins->std.volMacro.val[ins->std.volMacro.len++]=(cur*fadeOut)>>15; ins->std.volMacro.val[ins->std.volMacro.len++]=(cur*fadeOut)>>15;
if (++curPos>=macroLen) {
if (ins->std.volMacro.loop<macroLen) {
curPos=ins->std.volMacro.loop;
} else {
curPos=macroLen-1;
}
}
} }
if (ins->std.volMacro.len<255) { if (ins->std.volMacro.len<255) {
ins->std.volMacro.val[ins->std.volMacro.len++]=0; ins->std.volMacro.val[ins->std.volMacro.len++]=0;