etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-22 12:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

VGM export: QSound ADPCM fix, for real this time

Browse source
This commit is contained in:
tildearrow 2024-09-25 13:12:34 -05:00
parent 09689a3b78
commit 60d01de6fc
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/vgmOps.cpp
View file

@ -2283,8 +2283,11 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
w->writeI(0); w->writeI(0);
w->write(writeADPCM_Y8950[i]->getSampleMem(0),writeADPCM_Y8950[i]->getSampleMemUsage(0)); w->write(writeADPCM_Y8950[i]->getSampleMem(0),writeADPCM_Y8950[i]->getSampleMemUsage(0));
} }
if (writeQSound[i]!=NULL && writeQSound[i]->getSampleMemUsage(1)>0) { // QSound has two sample types sharing the same memory.
unsigned int blockSize=(writeQSound[i]->getSampleMemUsage(1)+0xffff)&(~0xffff); // however, they are prepresented as separate memories in Furnace.
// we find the largest one to see how much memory is being used in total.
if (writeQSound[i]!=NULL && (writeQSound[i]->getSampleMemUsage(0)>0 || writeQSound[i]->getSampleMemUsage(1)>0)) {
unsigned int blockSize=(writeQSound[i]->getSampleMemUsage(0)+writeQSound[i]->getSampleMemUsage(1)+0xffff)&(~0xffff);
if (blockSize > 0x1000000) { if (blockSize > 0x1000000) {
blockSize = 0x1000000; blockSize = 0x1000000;
} }
@ -2292,7 +2295,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
w->writeC(0x66); w->writeC(0x66);
w->writeC(0x8F); w->writeC(0x8F);
w->writeI((blockSize+8)|(i*0x80000000)); w->writeI((blockSize+8)|(i*0x80000000));
w->writeI(writeQSound[i]->getSampleMemCapacity(1)); w->writeI(writeQSound[i]->getSampleMemCapacity(0));
w->writeI(0); w->writeI(0);
w->write(writeQSound[i]->getSampleMem(),blockSize); w->write(writeQSound[i]->getSampleMem(),blockSize);
} }