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

VGM export: write loop point

Browse source 
proper channel reset after loop pending!!!
This commit is contained in:
tildearrow 2022-01-25 16:44:21 -05:00
parent 503a79c904
commit 3672ceccb7
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine/engine.cpp
View file

@ -2035,7 +2035,7 @@ void DivEngine::walkSong(int& loopOrder, int& loopRow) {
DivPattern* pat[DIV_MAX_CHANS]; DivPattern* pat[DIV_MAX_CHANS];
for (int i=0; i<song.ordersLen; i++) { for (int i=0; i<song.ordersLen; i++) {
for (int j=0; j<chans; j++) { for (int j=0; j<chans; j++) {
pat[j]=song.pat[j].getPattern(i,false); pat[j]=song.pat[j].getPattern(song.orders.ord[j][i],false);
} }
for (int j=nextRow; j<song.patLen; j++) { for (int j=nextRow; j<song.patLen; j++) {
nextRow=0; nextRow=0;
@ -2535,11 +2535,11 @@ SafeWriter* DivEngine::saveVGM() {
// write song data // write song data
playSub(false); playSub(false);
size_t tickCount=0; size_t tickCount=0;
bool writeLoop=false;
while (!done) { while (!done) {
if (loopPos==-1) { if (loopPos==-1) {
if (loopOrder==curOrder && loopRow==curRow) { if (loopOrder==curOrder && loopRow==curRow && ticks==1) {
loopPos=w->tell(); writeLoop=true;
loopTick=tickCount;
} }
} }
if (nextTick()) done=true; if (nextTick()) done=true;
@ -2612,7 +2612,14 @@ SafeWriter* DivEngine::saveVGM() {
w->writeS(totalWait); w->writeS(totalWait);
tickCount+=totalWait; tickCount+=totalWait;
} }
if (writeLoop) {
writeLoop=false;
loopPos=w->tell();
loopTick=tickCount;
}
} }
// end of song
w->writeC(0x66);
for (int i=0; i<song.systemLen; i++) { for (int i=0; i<song.systemLen; i++) {
disCont[i].dispatch->toggleRegisterDump(false); disCont[i].dispatch->toggleRegisterDump(false);
@ -2625,8 +2632,10 @@ SafeWriter* DivEngine::saveVGM() {
w->seek(0x18,SEEK_SET); w->seek(0x18,SEEK_SET);
w->writeI(tickCount); w->writeI(tickCount);
// loop not handled for now // loop not handled for now
printf("writing loop pos: %d\n",loopPos-0x1c);
printf("writing tick count: %d\n",(int)(tickCount-loopTick));
w->writeI(loopPos-0x1c); w->writeI(loopPos-0x1c);
w->writeI(tickCount-loopTick); w->writeI(tickCount-loopTick-1);
remainingLoops=-1; remainingLoops=-1;
playing=false; playing=false;