diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index e484baf31..87594f339 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -541,7 +541,7 @@ void DivEngine::renderSamples() { for (int i=0; ilength8+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) { paddedLen=131072; } @@ -977,7 +977,7 @@ int DivEngine::getEffectiveSampleRate(int rate) { return 1789773/(1789773/rate); case DIV_SYSTEM_SEGAPCM: case DIV_SYSTEM_SEGAPCM_COMPAT: return (31250*MIN(255,(rate*255/31250)))/255; - case DIV_SYSTEM_QSOUND: + case DIV_SYSTEM_QSOUND: 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: return 18518; // TODO: support ADPCM-B case diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp index ec7cd1cb8..3a79cebed 100644 --- a/src/engine/fileOps.cpp +++ b/src/engine/fileOps.cpp @@ -149,8 +149,8 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) { // Neo Geo detune 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_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_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.tuning=443.23; } @@ -259,8 +259,8 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) { ins->type=DIV_INS_C64; } 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_YM2610B || ds.system[0]==DIV_SYSTEM_YM2610B_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) { if (!ins->mode) { ins->type=DIV_INS_AY; } diff --git a/src/engine/platform/x1_010.cpp b/src/engine/platform/x1_010.cpp index 74bfdb13a..1705e8272 100644 --- a/src/engine/platform/x1_010.cpp +++ b/src/engine/platform/x1_010.cpp @@ -342,7 +342,7 @@ void DivPlatformX1_010::tick() { 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].inPorta) { if (chan[i].std.arpMode) { @@ -358,7 +358,7 @@ void DivPlatformX1_010::tick() { chan[i].freqChanged=true; } } - } + } if (chan[i].std.hadWave && !chan[i].pcm) { if (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) { - bool nextEnable=(chan[i].std.ex1&1); + bool nextEnable=(chan[i].std.ex1&1); if (nextEnable!=(chan[i].env.flag.envEnable)) { chan[i].env.flag.envEnable=nextEnable; if (!chan[i].pcm) { @@ -379,28 +379,28 @@ void DivPlatformX1_010::tick() { refreshControl(i); } } - bool nextOneshot=(chan[i].std.ex1&2); + bool nextOneshot=(chan[i].std.ex1&2); if (nextOneshot!=(chan[i].env.flag.envOneshot)) { chan[i].env.flag.envOneshot=nextOneshot; if (!chan[i].pcm) { refreshControl(i); } } - bool nextSplit=(chan[i].std.ex1&4); + bool nextSplit=(chan[i].std.ex1&4); if (nextSplit!=(chan[i].env.flag.envSplit)) { chan[i].env.flag.envSplit=nextSplit; if (!isMuted[i] && !chan[i].pcm) { 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)) { chan[i].env.flag.envHinv=nextHinv; if (!isMuted[i] && !chan[i].pcm) { 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)) { chan[i].env.flag.envVinv=nextVinv; if (!isMuted[i] && !chan[i].pcm) { @@ -435,7 +435,7 @@ void DivPlatformX1_010::tick() { } if (chan[i].envChanged) { 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; } updateEnvelope(i); @@ -500,10 +500,10 @@ int DivPlatformX1_010::dispatch(DivCommand c) { } if (skipRegisterWrites) break; if (chan[c.chan].furnacePCM) { - chan[c.chan].pcm=true; + chan[c.chan].pcm=true; chan[c.chan].std.init(ins); - chan[c.chan].sample=ins->amiga.initSample; - if (chan[c.chan].sample>=0 && chan[c.chan].samplesong.sampleLen) { + chan[c.chan].sample=ins->amiga.initSample; + if (chan[c.chan].sample>=0 && chan[c.chan].samplesong.sampleLen) { DivSample* s=parent->getSample(chan[c.chan].sample); chWrite(c.chan,4,(s->offX1_010>>12)&0xff); 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].freqChanged=true; } - } else { + } else { chan[c.chan].std.init(NULL); chan[c.chan].outVol=chan[c.chan].vol; if ((12*sampleBank+c.value%12)>=parent->song.sampleLen) { @@ -524,7 +524,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) { chWrite(c.chan,5,0); break; } - } + } } else { chan[c.chan].std.init(NULL); 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].envChanged=true; chan[c.chan].std.init(ins); - refreshControl(c.chan); + refreshControl(c.chan); break; } case DIV_CMD_NOTE_OFF: @@ -598,7 +598,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) { updateWave(c.chan); chan[c.chan].keyOn=true; break; - case DIV_CMD_X1_010_ENVELOPE_SHAPE: + case DIV_CMD_X1_010_ENVELOPE_SHAPE: if (chan[c.chan].env.shape!=c.value) { chan[c.chan].env.shape=c.value; if (!chan[c.chan].pcm) { @@ -677,7 +677,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) { } break; 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)) { chan[c.chan].env.flag.envEnable=nextEnable; if (!chan[c.chan].pcm) { @@ -687,28 +687,28 @@ int DivPlatformX1_010::dispatch(DivCommand c) { refreshControl(c.chan); } } - bool nextOneshot=c.value&2; + bool nextOneshot=c.value&2; if (nextOneshot!=(chan[c.chan].env.flag.envOneshot)) { chan[c.chan].env.flag.envOneshot=nextOneshot; if (!chan[c.chan].pcm) { refreshControl(c.chan); } } - bool nextSplit=c.value&4; + bool nextSplit=c.value&4; if (nextSplit!=(chan[c.chan].env.flag.envSplit)) { chan[c.chan].env.flag.envSplit=nextSplit; if (!isMuted[c.chan] && !chan[c.chan].pcm) { chan[c.chan].envChanged=true; } } - bool nextHinv=c.value&8; + bool nextHinv=c.value&8; if (nextHinv!=(chan[c.chan].env.flag.envHinv)) { chan[c.chan].env.flag.envHinv=nextHinv; if (!isMuted[c.chan] && !chan[c.chan].pcm) { chan[c.chan].envChanged=true; } } - bool nextVinv=c.value&16; + bool nextVinv=c.value&16; if (nextVinv!=(chan[c.chan].env.flag.envVinv)) { chan[c.chan].env.flag.envVinv=nextVinv; if (!isMuted[c.chan] && !chan[c.chan].pcm) { @@ -716,7 +716,7 @@ int DivPlatformX1_010::dispatch(DivCommand c) { } } break; - } + } case DIV_CMD_X1_010_ENVELOPE_PERIOD: chan[c.chan].env.period=c.value; if (!chan[c.chan].pcm) { @@ -816,7 +816,7 @@ void DivPlatformX1_010::setFlags(unsigned int flags) { case 1: // 16.67MHz (later hardwares) chipClock=50000000.0/3.0; break; - // Other clock is used? + // Other clock is used? } rate=chipClock/512; stereo=flags&16; diff --git a/src/engine/platform/x1_010.h b/src/engine/platform/x1_010.h index fd00fd1c9..8e03109ba 100644 --- a/src/engine/platform/x1_010.h +++ b/src/engine/platform/x1_010.h @@ -31,9 +31,9 @@ class DivX1_010Interface: public vgsound_emu_mem_intf { DivEngine* parent; int sampleBank; virtual u8 read_byte(u32 address) override { - if (parent->x1_010Mem==NULL) return 0; - return parent->x1_010Mem[address & 0xfffff]; - } + if (parent->x1_010Mem==NULL) return 0; + return parent->x1_010Mem[address & 0xfffff]; + } DivX1_010Interface(): parent(NULL), sampleBank(0) {} }; diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp index a6bcf9ac7..e7a6e45c2 100644 --- a/src/engine/platform/ym2610b.cpp +++ b/src/engine/platform/ym2610b.cpp @@ -752,7 +752,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) { chan[c.chan].std.init(ins); if (!chan[c.chan].std.willVol) { 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); immWrite(0x12,(s->offB>>8)&0xff); diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index 665409d67..b1a820952 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -256,7 +256,7 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe return false; } break; - } + } break; case DIV_SYSTEM_X1_010: switch (effect) { diff --git a/src/engine/sample.cpp b/src/engine/sample.cpp index b802bf791..571e35118 100644 --- a/src/engine/sample.cpp +++ b/src/engine/sample.cpp @@ -115,7 +115,7 @@ bool DivSample::initInternal(unsigned char d, int count) { case 8: // 8-bit if (data8!=NULL) delete[] data8; length8=count; - // for padding X1-010 sample + // for padding X1-010 sample data8=new signed char[(count+4095)&(~0xfff)]; memset(data8,0,(count+4095)&(~0xfff)); break; diff --git a/src/engine/vgmOps.cpp b/src/engine/vgmOps.cpp index 3c63f65c9..74654f6ea 100644 --- a/src/engine/vgmOps.cpp +++ b/src/engine/vgmOps.cpp @@ -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 hasOPNB|=0x80000000; - } + } break; case DIV_SYSTEM_AY8910: case DIV_SYSTEM_AY8930: diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 743f91083..50a2db78f 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -4959,7 +4959,7 @@ bool FurnaceGUI::loop() { updateWindowTitle(); } break; - } + } case DIV_SYSTEM_GB: case DIV_SYSTEM_YM2610: case DIV_SYSTEM_YM2610_EXT: diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index a66a7f585..7ce11531e 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -1392,12 +1392,12 @@ void FurnaceGUI::drawInsEdit() { ex1Max=4; ex2Max=15; } - if (ins->type==DIV_INS_X1_010) { - dutyMax=0; - ex1Max=5; - ex2Max=63; - ex2Bit=false; - } + if (ins->type==DIV_INS_X1_010) { + dutyMax=0; + ex1Max=5; + ex2Max=63; + ex2Bit=false; + } if (ins->type==DIV_INS_SAA1099) ex1Max=8; if (settings.macroView==0) { // modern view