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

YMZ280B: fix sample offset moving loop

Browse source 
issue #2213
This commit is contained in:
tildearrow 2024-12-29 17:55:58 -05:00
parent 5ffd47ed7b
commit 68eeef28e4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/platform/ymz280b.cpp
View file

@ -155,15 +155,6 @@ void DivPlatformYMZ280B::tick(bool sysTick) {
start=sampleOff[chan[i].sample]; start=sampleOff[chan[i].sample];
end=MIN(start+s->getCurBufLen(),getSampleMemCapacity()-1); end=MIN(start+s->getCurBufLen(),getSampleMemCapacity()-1);
} }
if (chan[i].audPos>0) {
switch (s->depth) {
case DIV_SAMPLE_DEPTH_YMZ_ADPCM: start+=chan[i].audPos/2; break;
case DIV_SAMPLE_DEPTH_8BIT: start+=chan[i].audPos; break;
case DIV_SAMPLE_DEPTH_16BIT: start+=chan[i].audPos*2; break;
default: break;
}
start=MIN(start,end);
}
if (s->isLoopable()) { if (s->isLoopable()) {
switch (s->depth) { switch (s->depth) {
case DIV_SAMPLE_DEPTH_YMZ_ADPCM: loopStart=start+s->loopStart/2; loopEnd=start+s->loopEnd/2; break; case DIV_SAMPLE_DEPTH_YMZ_ADPCM: loopStart=start+s->loopStart/2; loopEnd=start+s->loopEnd/2; break;
@ -174,6 +165,15 @@ void DivPlatformYMZ280B::tick(bool sysTick) {
loopEnd=MIN(loopEnd,end); loopEnd=MIN(loopEnd,end);
loopStart=MIN(loopStart,loopEnd); loopStart=MIN(loopStart,loopEnd);
} }
if (chan[i].audPos>0) {
switch (s->depth) {
case DIV_SAMPLE_DEPTH_YMZ_ADPCM: start+=chan[i].audPos/2; break;
case DIV_SAMPLE_DEPTH_8BIT: start+=chan[i].audPos; break;
case DIV_SAMPLE_DEPTH_16BIT: start+=chan[i].audPos*2; break;
default: break;
}
start=MIN(start,end);
}
rWrite(0x01+i*4,ctrl&~0x80); // force keyoff first rWrite(0x01+i*4,ctrl&~0x80); // force keyoff first
rWrite(0x20+i*4,(start>>16)&0xff); rWrite(0x20+i*4,(start>>16)&0xff);
rWrite(0x21+i*4,(loopStart>>16)&0xff); rWrite(0x21+i*4,(loopStart>>16)&0xff);