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

Fix accidently auto-generated spaces

Browse source
This commit is contained in:
cam900 2022-03-08 00:15:21 +09:00
parent b270513639
commit 65149a466f
10 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/engine.cpp
View file

@ -541,7 +541,7 @@ void DivEngine::renderSamples() {
for (int i=0; i<song.sampleLen; i++) { for (int i=0; i<song.sampleLen; i++) {
DivSample* s=song.sample[i]; DivSample* s=song.sample[i];
int paddedLen=(s->length8+4095)&(~0xfff); int paddedLen=(s->length8+4095)&(~0xfff);
// fit sample bank size to 128KB for Seta 2 external bankswitching logic (not emulated yet!) // fit sample bank size to 128KB for Seta 2 external bankswitching logic (not emulated yet!)
if (paddedLen>131072) { if (paddedLen>131072) {
paddedLen=131072; paddedLen=131072;
} }
@ -977,7 +977,7 @@ int DivEngine::getEffectiveSampleRate(int rate) {
return 1789773/(1789773/rate); return 1789773/(1789773/rate);
case DIV_SYSTEM_SEGAPCM: case DIV_SYSTEM_SEGAPCM_COMPAT: case DIV_SYSTEM_SEGAPCM: case DIV_SYSTEM_SEGAPCM_COMPAT:
return (31250*MIN(255,(rate*255/31250)))/255; return (31250*MIN(255,(rate*255/31250)))/255;
case DIV_SYSTEM_QSOUND: case DIV_SYSTEM_QSOUND:
return (24038*MIN(65535,(rate*4096/24038)))/4096; return (24038*MIN(65535,(rate*4096/24038)))/4096;
case DIV_SYSTEM_YM2610: case DIV_SYSTEM_YM2610_EXT: case DIV_SYSTEM_YM2610_FULL: case DIV_SYSTEM_YM2610_FULL_EXT: case DIV_SYSTEM_YM2610B: case DIV_SYSTEM_YM2610B_EXT: case DIV_SYSTEM_YM2610: case DIV_SYSTEM_YM2610_EXT: case DIV_SYSTEM_YM2610_FULL: case DIV_SYSTEM_YM2610_FULL_EXT: case DIV_SYSTEM_YM2610B: case DIV_SYSTEM_YM2610B_EXT:
return 18518; // TODO: support ADPCM-B case return 18518; // TODO: support ADPCM-B case

8
src/engine/fileOps.cpp
View file

@ -149,8 +149,8 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
// Neo Geo detune // Neo Geo detune
if (ds.system[0]==DIV_SYSTEM_YM2610 || ds.system[0]==DIV_SYSTEM_YM2610_EXT if (ds.system[0]==DIV_SYSTEM_YM2610 || ds.system[0]==DIV_SYSTEM_YM2610_EXT
|| ds.system[0]==DIV_SYSTEM_YM2610_FULL || ds.system[0]==DIV_SYSTEM_YM2610_FULL_EXT || ds.system[0]==DIV_SYSTEM_YM2610_FULL || ds.system[0]==DIV_SYSTEM_YM2610_FULL_EXT
|| ds.system[0]==DIV_SYSTEM_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_EXT) { || ds.system[0]==DIV_SYSTEM_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_EXT) {
ds.tuning=443.23; ds.tuning=443.23;
} }
@ -259,8 +259,8 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
ins->type=DIV_INS_C64; ins->type=DIV_INS_C64;
} }
if (ds.system[0]==DIV_SYSTEM_YM2610 || ds.system[0]==DIV_SYSTEM_YM2610_EXT if (ds.system[0]==DIV_SYSTEM_YM2610 || ds.system[0]==DIV_SYSTEM_YM2610_EXT
|| ds.system[0]==DIV_SYSTEM_YM2610_FULL || ds.system[0]==DIV_SYSTEM_YM2610_FULL_EXT || ds.system[0]==DIV_SYSTEM_YM2610_FULL || ds.system[0]==DIV_SYSTEM_YM2610_FULL_EXT
|| ds.system[0]==DIV_SYSTEM_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_EXT) { || ds.system[0]==DIV_SYSTEM_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_EXT) {
if (!ins->mode) { if (!ins->mode) {
ins->type=DIV_INS_AY; ins->type=DIV_INS_AY;
} }

44
src/engine/platform/x1_010.cpp
View file

@ -342,7 +342,7 @@ void DivPlatformX1_010::tick() {
chan[i].envChanged=true; chan[i].envChanged=true;
} }
} }
if ((!chan[i].pcm) || chan[i].furnacePCM) { if ((!chan[i].pcm) || chan[i].furnacePCM) {
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (!chan[i].inPorta) { if (!chan[i].inPorta) {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
@ -358,7 +358,7 @@ void DivPlatformX1_010::tick() {
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
} }
} }
if (chan[i].std.hadWave && !chan[i].pcm) { if (chan[i].std.hadWave && !chan[i].pcm) {
if (chan[i].wave!=chan[i].std.wave) { if (chan[i].wave!=chan[i].std.wave) {
chan[i].wave=chan[i].std.wave; chan[i].wave=chan[i].std.wave;
@ -369,7 +369,7 @@ void DivPlatformX1_010::tick() {
} }
} }
if (chan[i].std.hadEx1) { if (chan[i].std.hadEx1) {
bool nextEnable=(chan[i].std.ex1&1); bool nextEnable=(chan[i].std.ex1&1);
if (nextEnable!=(chan[i].env.flag.envEnable)) { if (nextEnable!=(chan[i].env.flag.envEnable)) {
chan[i].env.flag.envEnable=nextEnable; chan[i].env.flag.envEnable=nextEnable;
if (!chan[i].pcm) { if (!chan[i].pcm) {
@ -379,28 +379,28 @@ void DivPlatformX1_010::tick() {
refreshControl(i); refreshControl(i);
} }
} }
bool nextOneshot=(chan[i].std.ex1&2); bool nextOneshot=(chan[i].std.ex1&2);
if (nextOneshot!=(chan[i].env.flag.envOneshot)) { if (nextOneshot!=(chan[i].env.flag.envOneshot)) {
chan[i].env.flag.envOneshot=nextOneshot; chan[i].env.flag.envOneshot=nextOneshot;
if (!chan[i].pcm) { if (!chan[i].pcm) {
refreshControl(i); refreshControl(i);
} }
} }
bool nextSplit=(chan[i].std.ex1&4); bool nextSplit=(chan[i].std.ex1&4);
if (nextSplit!=(chan[i].env.flag.envSplit)) { if (nextSplit!=(chan[i].env.flag.envSplit)) {
chan[i].env.flag.envSplit=nextSplit; chan[i].env.flag.envSplit=nextSplit;
if (!isMuted[i] && !chan[i].pcm) { if (!isMuted[i] && !chan[i].pcm) {
chan[i].envChanged=true; chan[i].envChanged=true;
} }
} }
bool nextHinv=(chan[i].std.ex1&8); bool nextHinv=(chan[i].std.ex1&8);
if (nextHinv!=(chan[i].env.flag.envHinv)) { if (nextHinv!=(chan[i].env.flag.envHinv)) {
chan[i].env.flag.envHinv=nextHinv; chan[i].env.flag.envHinv=nextHinv;
if (!isMuted[i] && !chan[i].pcm) { if (!isMuted[i] && !chan[i].pcm) {
chan[i].envChanged=true; chan[i].envChanged=true;
} }
} }
bool nextVinv=(chan[i].std.ex1&16); bool nextVinv=(chan[i].std.ex1&16);
if (nextVinv!=(chan[i].env.flag.envVinv)) { if (nextVinv!=(chan[i].env.flag.envVinv)) {
chan[i].env.flag.envVinv=nextVinv; chan[i].env.flag.envVinv=nextVinv;
if (!isMuted[i] && !chan[i].pcm) { if (!isMuted[i] && !chan[i].pcm) {
@ -435,7 +435,7 @@ void DivPlatformX1_010::tick() {
} }
if (chan[i].envChanged) { if (chan[i].envChanged) {
if (!isMuted[i]) { if (!isMuted[i]) {
chan[i].lvol=((chan[i].outVol&0xf)*((chan[i].pan>>4)&0xf))/15; chan[i].lvol=((chan[i].outVol&0xf)*((chan[i].pan>>4)&0xf))/15;
chan[i].rvol=((chan[i].outVol&0xf)*((chan[i].pan>>0)&0xf))/15; chan[i].rvol=((chan[i].outVol&0xf)*((chan[i].pan>>0)&0xf))/15;
} }
updateEnvelope(i); updateEnvelope(i);
@ -500,10 +500,10 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
} }
if (skipRegisterWrites) break; if (skipRegisterWrites) break;
if (chan[c.chan].furnacePCM) { if (chan[c.chan].furnacePCM) {
chan[c.chan].pcm=true; chan[c.chan].pcm=true;
chan[c.chan].std.init(ins); chan[c.chan].std.init(ins);
chan[c.chan].sample=ins->amiga.initSample; chan[c.chan].sample=ins->amiga.initSample;
if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) { if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
DivSample* s=parent->getSample(chan[c.chan].sample); DivSample* s=parent->getSample(chan[c.chan].sample);
chWrite(c.chan,4,(s->offX1_010>>12)&0xff); chWrite(c.chan,4,(s->offX1_010>>12)&0xff);
int end=(s->offX1_010+s->length8+0xfff)&~0xfff; // padded int end=(s->offX1_010+s->length8+0xfff)&~0xfff; // padded
@ -513,7 +513,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
chan[c.chan].baseFreq=NoteX1_010(c.chan,chan[c.chan].note); chan[c.chan].baseFreq=NoteX1_010(c.chan,chan[c.chan].note);
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
} }
} else { } else {
chan[c.chan].std.init(NULL); chan[c.chan].std.init(NULL);
chan[c.chan].outVol=chan[c.chan].vol; chan[c.chan].outVol=chan[c.chan].vol;
if ((12*sampleBank+c.value%12)>=parent->song.sampleLen) { if ((12*sampleBank+c.value%12)>=parent->song.sampleLen) {
@ -524,7 +524,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
chWrite(c.chan,5,0); chWrite(c.chan,5,0);
break; break;
} }
} }
} else { } else {
chan[c.chan].std.init(NULL); chan[c.chan].std.init(NULL);
chan[c.chan].outVol=chan[c.chan].vol; chan[c.chan].outVol=chan[c.chan].vol;
@ -552,7 +552,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;
chan[c.chan].envChanged=true; chan[c.chan].envChanged=true;
chan[c.chan].std.init(ins); chan[c.chan].std.init(ins);
refreshControl(c.chan); refreshControl(c.chan);
break; break;
} }
case DIV_CMD_NOTE_OFF: case DIV_CMD_NOTE_OFF:
@ -598,7 +598,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
updateWave(c.chan); updateWave(c.chan);
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;
break; break;
case DIV_CMD_X1_010_ENVELOPE_SHAPE: case DIV_CMD_X1_010_ENVELOPE_SHAPE:
if (chan[c.chan].env.shape!=c.value) { if (chan[c.chan].env.shape!=c.value) {
chan[c.chan].env.shape=c.value; chan[c.chan].env.shape=c.value;
if (!chan[c.chan].pcm) { if (!chan[c.chan].pcm) {
@ -677,7 +677,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_X1_010_ENVELOPE_MODE: { case DIV_CMD_X1_010_ENVELOPE_MODE: {
bool nextEnable=c.value&1; bool nextEnable=c.value&1;
if (nextEnable!=(chan[c.chan].env.flag.envEnable)) { if (nextEnable!=(chan[c.chan].env.flag.envEnable)) {
chan[c.chan].env.flag.envEnable=nextEnable; chan[c.chan].env.flag.envEnable=nextEnable;
if (!chan[c.chan].pcm) { if (!chan[c.chan].pcm) {
@ -687,28 +687,28 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
refreshControl(c.chan); refreshControl(c.chan);
} }
} }
bool nextOneshot=c.value&2; bool nextOneshot=c.value&2;
if (nextOneshot!=(chan[c.chan].env.flag.envOneshot)) { if (nextOneshot!=(chan[c.chan].env.flag.envOneshot)) {
chan[c.chan].env.flag.envOneshot=nextOneshot; chan[c.chan].env.flag.envOneshot=nextOneshot;
if (!chan[c.chan].pcm) { if (!chan[c.chan].pcm) {
refreshControl(c.chan); refreshControl(c.chan);
} }
} }
bool nextSplit=c.value&4; bool nextSplit=c.value&4;
if (nextSplit!=(chan[c.chan].env.flag.envSplit)) { if (nextSplit!=(chan[c.chan].env.flag.envSplit)) {
chan[c.chan].env.flag.envSplit=nextSplit; chan[c.chan].env.flag.envSplit=nextSplit;
if (!isMuted[c.chan] && !chan[c.chan].pcm) { if (!isMuted[c.chan] && !chan[c.chan].pcm) {
chan[c.chan].envChanged=true; chan[c.chan].envChanged=true;
} }
} }
bool nextHinv=c.value&8; bool nextHinv=c.value&8;
if (nextHinv!=(chan[c.chan].env.flag.envHinv)) { if (nextHinv!=(chan[c.chan].env.flag.envHinv)) {
chan[c.chan].env.flag.envHinv=nextHinv; chan[c.chan].env.flag.envHinv=nextHinv;
if (!isMuted[c.chan] && !chan[c.chan].pcm) { if (!isMuted[c.chan] && !chan[c.chan].pcm) {
chan[c.chan].envChanged=true; chan[c.chan].envChanged=true;
} }
} }
bool nextVinv=c.value&16; bool nextVinv=c.value&16;
if (nextVinv!=(chan[c.chan].env.flag.envVinv)) { if (nextVinv!=(chan[c.chan].env.flag.envVinv)) {
chan[c.chan].env.flag.envVinv=nextVinv; chan[c.chan].env.flag.envVinv=nextVinv;
if (!isMuted[c.chan] && !chan[c.chan].pcm) { if (!isMuted[c.chan] && !chan[c.chan].pcm) {
@ -716,7 +716,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
} }
} }
break; break;
} }
case DIV_CMD_X1_010_ENVELOPE_PERIOD: case DIV_CMD_X1_010_ENVELOPE_PERIOD:
chan[c.chan].env.period=c.value; chan[c.chan].env.period=c.value;
if (!chan[c.chan].pcm) { if (!chan[c.chan].pcm) {
@ -816,7 +816,7 @@ void DivPlatformX1_010::setFlags(unsigned int flags) {
case 1: // 16.67MHz (later hardwares) case 1: // 16.67MHz (later hardwares)
chipClock=50000000.0/3.0; chipClock=50000000.0/3.0;
break; break;
// Other clock is used? // Other clock is used?
} }
rate=chipClock/512; rate=chipClock/512;
stereo=flags&16; stereo=flags&16;

6
src/engine/platform/x1_010.h
View file

@ -31,9 +31,9 @@ class DivX1_010Interface: public vgsound_emu_mem_intf {
DivEngine* parent; DivEngine* parent;
int sampleBank; int sampleBank;
virtual u8 read_byte(u32 address) override { virtual u8 read_byte(u32 address) override {
if (parent->x1_010Mem==NULL) return 0; if (parent->x1_010Mem==NULL) return 0;
return parent->x1_010Mem[address & 0xfffff]; return parent->x1_010Mem[address & 0xfffff];
} }
DivX1_010Interface(): parent(NULL), sampleBank(0) {} DivX1_010Interface(): parent(NULL), sampleBank(0) {}
}; };

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

@ -752,7 +752,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
chan[c.chan].std.init(ins); chan[c.chan].std.init(ins);
if (!chan[c.chan].std.willVol) { if (!chan[c.chan].std.willVol) {
chan[c.chan].outVol=chan[c.chan].vol; chan[c.chan].outVol=chan[c.chan].vol;
immWrite(0x1b,chan[c.chan].outVol); immWrite(0x1b,chan[c.chan].outVol);
} }
DivSample* s=parent->getSample(ins->amiga.initSample); DivSample* s=parent->getSample(ins->amiga.initSample);
immWrite(0x12,(s->offB>>8)&0xff); immWrite(0x12,(s->offB>>8)&0xff);

2
src/engine/playback.cpp
View file

@ -256,7 +256,7 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe
return false; return false;
} }
break; break;
} }
break; break;
case DIV_SYSTEM_X1_010: case DIV_SYSTEM_X1_010:
switch (effect) { switch (effect) {

2
src/engine/sample.cpp
View file

@ -115,7 +115,7 @@ bool DivSample::initInternal(unsigned char d, int count) {
case 8: // 8-bit case 8: // 8-bit
if (data8!=NULL) delete[] data8; if (data8!=NULL) delete[] data8;
length8=count; length8=count;
// for padding X1-010 sample // for padding X1-010 sample
data8=new signed char[(count+4095)&(~0xfff)]; data8=new signed char[(count+4095)&(~0xfff)];
memset(data8,0,(count+4095)&(~0xfff)); memset(data8,0,(count+4095)&(~0xfff));
break; break;

2
src/engine/vgmOps.cpp
View file

@ -679,7 +679,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
} }
if (((song.system[i]==DIV_SYSTEM_YM2610B) || (song.system[i]==DIV_SYSTEM_YM2610B_EXT)) && (!(hasOPNB&0x80000000))) { // YM2610B flag if (((song.system[i]==DIV_SYSTEM_YM2610B) || (song.system[i]==DIV_SYSTEM_YM2610B_EXT)) && (!(hasOPNB&0x80000000))) { // YM2610B flag
hasOPNB|=0x80000000; hasOPNB|=0x80000000;
} }
break; break;
case DIV_SYSTEM_AY8910: case DIV_SYSTEM_AY8910:
case DIV_SYSTEM_AY8930: case DIV_SYSTEM_AY8930:

2
src/gui/gui.cpp
View file

@ -4959,7 +4959,7 @@ bool FurnaceGUI::loop() {
updateWindowTitle(); updateWindowTitle();
} }
break; break;
} }
case DIV_SYSTEM_GB: case DIV_SYSTEM_GB:
case DIV_SYSTEM_YM2610: case DIV_SYSTEM_YM2610:
case DIV_SYSTEM_YM2610_EXT: case DIV_SYSTEM_YM2610_EXT:

12
src/gui/insEdit.cpp
View file

@ -1392,12 +1392,12 @@ void FurnaceGUI::drawInsEdit() {
ex1Max=4; ex1Max=4;
ex2Max=15; ex2Max=15;
} }
if (ins->type==DIV_INS_X1_010) { if (ins->type==DIV_INS_X1_010) {
dutyMax=0; dutyMax=0;
ex1Max=5; ex1Max=5;
ex2Max=63; ex2Max=63;
ex2Bit=false; ex2Bit=false;
} }
if (ins->type==DIV_INS_SAA1099) ex1Max=8; if (ins->type==DIV_INS_SAA1099) ex1Max=8;
if (settings.macroView==0) { // modern view if (settings.macroView==0) { // modern view