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

Address comments

Browse source
This commit is contained in:
cam900 2023-02-06 09:16:28 +09:00
parent 03e0c8d8ee
commit 2c5dc0875a
7 changed files with 14 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/engine/platform/es5506.h
View file

@ -185,17 +185,6 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
signed int oscOut;
DivInstrumentES5506::Filter filter;
DivInstrumentES5506::Envelope envelope;
virtual void macroInit(DivInstrument* which) override {
SharedChannel<unsigned int>::macroInit(which);
if (std.ex1.mode==2) {
k1Offs=0;
}
if (std.ex1.mode==2) {
k2Offs=0;
}
k1Prev=0xffff;
k2Prev=0xffff;
}
Channel():
SharedChannel<unsigned int>(0xff),
pcm(PCM()),

8
src/engine/platform/ym2610.cpp
View file

@ -820,7 +820,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
DivSample* s=parent->getSample(chan[c.chan].sample);
immWrite(0x12,(sampleOffB[chan[c.chan].sample]>>8)&0xff);
immWrite(0x13,sampleOffB[chan[c.chan].sample]>>16);
int end=((sampleOffB[chan[c.chan].sample]+s->lengthB+0xff)&~0xff)-1;
int end=sampleOffB[chan[c.chan].sample]+s->lengthB-1;
immWrite(0x14,(end>>8)&0xff);
immWrite(0x15,end>>16);
immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
@ -851,7 +851,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
DivSample* s=parent->getSample(12*sampleBank+c.value%12);
immWrite(0x12,(sampleOffB[chan[c.chan].sample]>>8)&0xff);
immWrite(0x13,sampleOffB[chan[c.chan].sample]>>16);
int end=((sampleOffB[chan[c.chan].sample]+s->lengthB+0xff)&~0xff)-1;
int end=sampleOffB[chan[c.chan].sample]+s->lengthB-1;
immWrite(0x14,(end>>8)&0xff);
immWrite(0x15,end>>16);
immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
@ -891,7 +891,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
DivSample* s=parent->getSample(chan[c.chan].sample);
immWrite(0x110+c.chan-adpcmAChanOffs,(sampleOffA[chan[c.chan].sample]>>8)&0xff);
immWrite(0x118+c.chan-adpcmAChanOffs,sampleOffA[chan[c.chan].sample]>>16);
int end=((sampleOffA[chan[c.chan].sample]+s->lengthA+0xff)&~0xff)-1;
int end=sampleOffA[chan[c.chan].sample]+s->lengthA-1;
immWrite(0x120+c.chan-adpcmAChanOffs,(end>>8)&0xff);
immWrite(0x128+c.chan-adpcmAChanOffs,end>>16);
immWrite(0x108+c.chan-adpcmAChanOffs,isMuted[c.chan]?0:((chan[c.chan].pan<<6)|chan[c.chan].outVol));
@ -922,7 +922,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
DivSample* s=parent->getSample(12*sampleBank+c.value%12);
immWrite(0x110+c.chan-adpcmAChanOffs,(sampleOffA[chan[c.chan].sample]>>8)&0xff);
immWrite(0x118+c.chan-adpcmAChanOffs,sampleOffA[chan[c.chan].sample]>>16);
int end=((sampleOffA[chan[c.chan].sample]+s->lengthA+0xff)&~0xff)-1;
int end=sampleOffA[chan[c.chan].sample]+s->lengthA-1;
immWrite(0x120+c.chan-adpcmAChanOffs,(end>>8)&0xff);
immWrite(0x128+c.chan-adpcmAChanOffs,end>>16);
immWrite(0x108+c.chan-adpcmAChanOffs,isMuted[c.chan]?0:((chan[c.chan].pan<<6)|chan[c.chan].outVol));

8
src/engine/platform/ym2610b.cpp
View file

@ -887,7 +887,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
DivSample* s=parent->getSample(chan[c.chan].sample);
immWrite(0x12,(sampleOffB[chan[c.chan].sample]>>8)&0xff);
immWrite(0x13,sampleOffB[chan[c.chan].sample]>>16);
int end=((sampleOffB[chan[c.chan].sample]+s->lengthB+0xff)&~0xff)-1;
int end=sampleOffB[chan[c.chan].sample]+s->lengthB-1;
immWrite(0x14,(end>>8)&0xff);
immWrite(0x15,end>>16);
immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
@ -918,7 +918,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
DivSample* s=parent->getSample(12*sampleBank+c.value%12);
immWrite(0x12,(sampleOffB[chan[c.chan].sample]>>8)&0xff);
immWrite(0x13,sampleOffB[chan[c.chan].sample]>>16);
int end=((sampleOffB[chan[c.chan].sample]+s->lengthB+0xff)&~0xff)-1;
int end=sampleOffB[chan[c.chan].sample]+s->lengthB-1;
immWrite(0x14,(end>>8)&0xff);
immWrite(0x15,end>>16);
immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
@ -958,7 +958,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
DivSample* s=parent->getSample(chan[c.chan].sample);
immWrite(0x110+c.chan-adpcmAChanOffs,(sampleOffA[chan[c.chan].sample]>>8)&0xff);
immWrite(0x118+c.chan-adpcmAChanOffs,sampleOffA[chan[c.chan].sample]>>16);
int end=((sampleOffA[chan[c.chan].sample]+s->lengthA+0xff)&~0xff)-1;
int end=sampleOffA[chan[c.chan].sample]+s->lengthA-1;
immWrite(0x120+c.chan-adpcmAChanOffs,(end>>8)&0xff);
immWrite(0x128+c.chan-adpcmAChanOffs,end>>16);
immWrite(0x108+c.chan-adpcmAChanOffs,isMuted[c.chan]?0:((chan[c.chan].pan<<6)|chan[c.chan].outVol));
@ -989,7 +989,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
DivSample* s=parent->getSample(12*sampleBank+c.value%12);
immWrite(0x110+c.chan-adpcmAChanOffs,(sampleOffA[chan[c.chan].sample]>>8)&0xff);
immWrite(0x118+c.chan-adpcmAChanOffs,sampleOffA[chan[c.chan].sample]>>16);
int end=((sampleOffA[chan[c.chan].sample]+s->lengthA+0xff)&~0xff)-1;
int end=sampleOffA[chan[c.chan].sample]+s->lengthA-1;
immWrite(0x120+c.chan-adpcmAChanOffs,(end>>8)&0xff);
immWrite(0x128+c.chan-adpcmAChanOffs,end>>16);
immWrite(0x108+c.chan-adpcmAChanOffs,isMuted[c.chan]?0:((chan[c.chan].pan<<6)|chan[c.chan].outVol));