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

Fix volume, Reduce unnecessary values

Browse source
This commit is contained in:
cam900 2022-12-15 20:12:06 +09:00
parent d5f44557c2
commit e2ea883315
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/platform/ga20.cpp
View file

@ -72,9 +72,9 @@ void DivPlatformGA20::acquire(short* bufL, short* bufR, size_t start, size_t len
} }
} }
ga20.sound_stream_update(ga20Buf, 1); ga20.sound_stream_update(ga20Buf, 1);
bufL[h]=(ga20Buf[0][h]+ga20Buf[1][h]+ga20Buf[2][h]+ga20Buf[3][h])<<4; bufL[h]=(ga20Buf[0][h]+ga20Buf[1][h]+ga20Buf[2][h]+ga20Buf[3][h]);
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
oscBuf[i]->data[oscBuf[i]->needle++]=ga20Buf[i][h]<<6; oscBuf[i]->data[oscBuf[i]->needle++]=ga20Buf[i][h];
} }
} }
} }
@ -345,12 +345,8 @@ void DivPlatformGA20::reset() {
chan[i]=DivPlatformGA20::Channel(); chan[i]=DivPlatformGA20::Channel();
chan[i].std.setEngine(parent); chan[i].std.setEngine(parent);
// keyoff all channels // keyoff all channels
chWrite(i,0,0);
chWrite(i,1,0);
chWrite(i,2,0xff);
chWrite(i,3,0xff);
chWrite(i,4,1);
chWrite(i,5,0); chWrite(i,5,0);
chWrite(i,6,0);
} }
} }
@ -439,7 +435,7 @@ void DivPlatformGA20::renderSamples(int sysID) {
sampleOffGA20[i]=memPos; sampleOffGA20[i]=memPos;
for (int j=0; j<actualLength; j++) { for (int j=0; j<actualLength; j++) {
// convert to 8 bit unsigned // convert to 8 bit unsigned
unsigned char val=((unsigned char)s->data8[j])^0x80; unsigned char val=((unsigned char)(s->data8[j]))^0x80;
sampleMem[memPos++]=CLAMP(val,1,255); sampleMem[memPos++]=CLAMP(val,1,255);
} }
// write end of sample marker // write end of sample marker
@ -452,6 +448,7 @@ void DivPlatformGA20::renderSamples(int sysID) {
} else { } else {
sampleLoaded[i]=true; sampleLoaded[i]=true;
} }
// allign to 16 byte
memPos=(memPos+0xf)&~0xf; memPos=(memPos+0xf)&~0xf;
} }
sampleMemLen=memPos; sampleMemLen=memPos;

13
src/engine/platform/ga20.h
View file

@ -29,25 +29,18 @@ class DivPlatformGA20: public DivDispatch, public iremga20_intf {
struct Channel: public SharedChannel<int> { struct Channel: public SharedChannel<int> {
int prevFreq; int prevFreq;
unsigned int audPos; unsigned int audPos;
int prevBank;
int sample; int sample;
int panning, prevPan;
bool volumeChanged, setPos; bool volumeChanged, setPos;
int resVol, lvol, rvol; int resVol;
int macroVolMul; int macroVolMul;
Channel(): Channel():
SharedChannel<int>(15), SharedChannel<int>(255),
prevFreq(-1), prevFreq(-1),
audPos(0), audPos(0),
prevBank(-1),
sample(-1), sample(-1),
panning(255),
prevPan(-1),
volumeChanged(false), volumeChanged(false),
setPos(false), setPos(false),
resVol(15), resVol(255),
lvol(15),
rvol(15),
macroVolMul(64) {} macroVolMul(64) {}
}; };
Channel chan[4]; Channel chan[4];