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

Fix CI build

Browse source
This commit is contained in:
Natt Akuma 2024-03-17 05:17:22 +07:00
parent 48b51f5108
commit 7fe7c67b4b
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/instrument.cpp
View file

@ -1068,6 +1068,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
featureSM=true; featureSM=true;
featureSL=true; featureSL=true;
break; break;
case DIV_INS_GBA_MINMOD:
featureSM=true;
featureSL=true;
break;
case DIV_INS_MAX: case DIV_INS_MAX:
break; break;
case DIV_INS_NULL: case DIV_INS_NULL:

12
src/engine/platform/gbaminmod.cpp
View file

@ -67,12 +67,12 @@ void DivPlatformGBAMinMod::acquire(short** buf, size_t len) {
// the driver generates 4 samples at a time and can be start-offset // the driver generates 4 samples at a time and can be start-offset
sampPos=mixBufReadPos&3; sampPos=mixBufReadPos&3;
if (sampPos==mixBufOffset) { if (sampPos==mixBufOffset) {
for (int j=mixBufOffset; j<4; j++) { for (size_t j=mixBufOffset; j<4; j++) {
mixOut[0][j]=0; mixOut[0][j]=0;
mixOut[1][j]=0; mixOut[1][j]=0;
} }
for (int i=0; i<chanMax; i++) { for (int i=0; i<chanMax; i++) {
for (int j=mixBufOffset; j<4; j++) { for (size_t j=mixBufOffset; j<4; j++) {
unsigned int lastAddr=chState[i].address>>32; unsigned int lastAddr=chState[i].address>>32;
chState[i].address+=((unsigned long long)chState[i].freq)<<8; chState[i].address+=((unsigned long long)chState[i].freq)<<8;
unsigned int newAddr=chState[i].address>>32; unsigned int newAddr=chState[i].address>>32;
@ -114,7 +114,7 @@ void DivPlatformGBAMinMod::acquire(short** buf, size_t len) {
oscOut[i][j]=volScale>0?outA*64/volScale:0; oscOut[i][j]=volScale>0?outA*64/volScale:0;
} }
} }
for (int j=mixBufOffset; j<4; j++) { for (size_t j=mixBufOffset; j<4; j++) {
mixBuf[mixBufPage][mixBufWritePos]=mixOut[0][j]; mixBuf[mixBufPage][mixBufWritePos]=mixOut[0][j];
mixBuf[mixBufPage+1][mixBufWritePos]=mixOut[1][j]; mixBuf[mixBufPage+1][mixBufWritePos]=mixOut[1][j];
mixBufWritePos++; mixBufWritePos++;
@ -152,7 +152,7 @@ void DivPlatformGBAMinMod::acquire(short** buf, size_t len) {
mixBufOffset=(4-(mixBufReadPos&3))&3; mixBufOffset=(4-(mixBufReadPos&3))&3;
mixBufReadPos=0; mixBufReadPos=0;
mixBufWritePos=mixBufOffset; mixBufWritePos=mixBufOffset;
for (int j=0; j<mixBufOffset; j++) { for (size_t j=0; j<mixBufOffset; j++) {
mixOut[0][j]=mixOut[0][4-mixBufOffset+j]; mixOut[0][j]=mixOut[0][4-mixBufOffset+j];
mixOut[1][j]=mixOut[1][4-mixBufOffset+j]; mixOut[1][j]=mixOut[1][4-mixBufOffset+j];
mixBuf[mixBufPage][j]=mixOut[0][j]; mixBuf[mixBufPage][j]=mixOut[0][j];
@ -164,7 +164,7 @@ void DivPlatformGBAMinMod::acquire(short** buf, size_t len) {
if(echoDelay) { if(echoDelay) {
echoDelay=echoDelay*2-((chan[i].echo&0x10)?0:1); echoDelay=echoDelay*2-((chan[i].echo&0x10)?0:1);
size_t echoPage=(mixBufPage+mixBufs*2-echoDelay)%(mixBufs*2); size_t echoPage=(mixBufPage+mixBufs*2-echoDelay)%(mixBufs*2);
chState[i].address=(0x03000800+echoPage*1024)<<32; chState[i].address=(0x03000800ULL+echoPage*1024)<<32;
chState[i].loopStart=0-echoDelay; chState[i].loopStart=0-echoDelay;
chState[i].loopEnd=0-echoDelay; chState[i].loopEnd=0-echoDelay;
} }
@ -739,7 +739,7 @@ void DivPlatformGBAMinMod::setFlags(const DivConfig& flags) {
for (int i=0; i<chanMax; i++) { for (int i=0; i<chanMax; i++) {
wtMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Channel %d",i),-1,i*256,i*256)); wtMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Channel %d",i),-1,i*256,i*256));
} }
for (int i=0; i<mixBufs; i++) { for (int i=0; i<(int)mixBufs; i++) {
mixMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Buffer %d Left",i),-1,i*2048,i*2048)); mixMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Buffer %d Left",i),-1,i*2048,i*2048));
mixMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Buffer %d Right",i),-1,i*2048+1024,i*2048+1024)); mixMemCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM, fmt::sprintf("Buffer %d Right",i),-1,i*2048+1024,i*2048+1024));
} }

1
src/engine/platform/gbaminmod.h
View file

@ -61,7 +61,6 @@ class DivPlatformGBAMinMod: public DivDispatch {
// emulator part // emulator part
unsigned int mixBufs; unsigned int mixBufs;
unsigned int mixBufSize;
unsigned int dacDepth; unsigned int dacDepth;
unsigned int sampCycles; unsigned int sampCycles;
unsigned int sampTimer; unsigned int sampTimer;

2
src/gui/memory.cpp
View file

@ -110,7 +110,7 @@ void FurnaceGUI::drawMemory() {
} }
break; break;
case DIV_MEMORY_WAVE_8BIT_SIGNED: case DIV_MEMORY_WAVE_8BIT_SIGNED:
for (int k=0; k<mc->capacity; k++) { for (int k=0; k<(int)mc->capacity; k++) {
signed char val=(signed char)mc->memory[k]; signed char val=(signed char)mc->memory[k];
ImVec2 pos1=ImLerp(dataRect.Min,dataRect.Max,ImVec2((double)k/(double)(mc->capacity),1.0f-((float)(val+129)/256.0f))); ImVec2 pos1=ImLerp(dataRect.Min,dataRect.Max,ImVec2((double)k/(double)(mc->capacity),1.0f-((float)(val+129)/256.0f)));
ImVec2 pos2=ImLerp(dataRect.Min,dataRect.Max,ImVec2((double)(k+1)/(double)(mc->capacity),1.0f)); ImVec2 pos2=ImLerp(dataRect.Min,dataRect.Max,ImVec2((double)(k+1)/(double)(mc->capacity),1.0f));