dev137 - new mixing volumes

YM2612 is now twice as loud
SN76489 and OPLL are 1.5x loud
X1-010 is four times louder

papers/format.md

@@ -32,6 +32,7 @@ these fields are 0 in format versions prior to 100 (0.6pre1).
 
 the format versions are:
 
+- 137: Furnace dev137
 - 136: Furnace dev136
 - 135: Furnace dev135
 - 134: Furnace dev134

src/engine/engine.h

@@ -47,8 +47,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev136"
+#define DIV_VERSION "dev137"
-#define DIV_ENGINE_VERSION 136
+#define DIV_ENGINE_VERSION 137
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02

src/engine/fileOps.cpp

@@ -2574,6 +2574,32 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
       }
     }
 
+    // new YM2612/SN/X1-010 volumes
+    if (ds.version<137) {
+      for (int i=0; i<ds.systemLen; i++) {
+        switch (ds.system[i]) {
+          case DIV_SYSTEM_YM2612:
+          case DIV_SYSTEM_YM2612_EXT:
+          case DIV_SYSTEM_YM2612_DUALPCM:
+          case DIV_SYSTEM_YM2612_DUALPCM_EXT:
+          case DIV_SYSTEM_YM2612_CSM:
+            ds.systemVol[i]/=2.0;
+            break;
+          case DIV_SYSTEM_SMS:
+          case DIV_SYSTEM_T6W28:
+          case DIV_SYSTEM_OPLL:
+          case DIV_SYSTEM_OPLL_DRUMS:
+            ds.systemVol[i]/=1.5;
+            break;
+          case DIV_SYSTEM_X1_010:
+            ds.systemVol[i]/=4.0;
+            break;
+          default:
+            break;
+        }
+      }
+    }
+
     if (active) quitDispatch();
     BUSY_BEGIN_SOFT;
     saveLock.lock();

src/engine/platform/genesis.cpp

@@ -1170,6 +1170,10 @@ int DivPlatformGenesis::getRegisterPoolSize() {
   return 512;
 }
 
+float DivPlatformGenesis::getPostAmp() {
+  return 2.0f;
+}
+
 void DivPlatformGenesis::reset() {
   while (!writes.empty()) writes.pop_front();
   memset(regPool,0,512);

src/engine/platform/genesis.h

@@ -114,6 +114,7 @@ class DivPlatformGenesis: public DivPlatformOPN {
     void setYMFM(bool use);
     bool keyOffAffectsArp(int ch);
     bool keyOffAffectsPorta(int ch);
+    float getPostAmp();
     void toggleRegisterDump(bool enable);
     void setFlags(const DivConfig& flags);
     void notifyInsChange(int ins);

src/engine/platform/opll.cpp

@@ -958,6 +958,10 @@ void DivPlatformOPLL::setYMFM(bool use) {
   useYMFM=use;
 }
 
+float DivPlatformOPLL::getPostAmp() {
+  return 1.5f;
+}
+
 void DivPlatformOPLL::setFlags(const DivConfig& flags) {
   int clockSel=flags.getInt("clockSel",0);
   if (clockSel==3) {

src/engine/platform/opll.h

@@ -95,6 +95,7 @@ class DivPlatformOPLL: public DivDispatch {
     void setYMFM(bool use);
     bool keyOffAffectsArp(int ch);
     bool keyOffAffectsPorta(int ch);
+    float getPostAmp();
     void toggleRegisterDump(bool enable);
     void setVRC7(bool vrc);
     void setProperDrums(bool pd);

src/engine/platform/sms.cpp

@@ -39,6 +39,10 @@ const char** DivPlatformSMS::getRegisterSheet() {
   return stereo?regCheatSheetGG:regCheatSheetSN;
 }
 
+float DivPlatformSMS::getPostAmp() {
+  return 1.5f;
+}
+
 void DivPlatformSMS::acquire_nuked(short** buf, size_t len) {
   int oL=0;
   int oR=0;

src/engine/platform/sms.h

@@ -81,6 +81,7 @@ class DivPlatformSMS: public DivDispatch {
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
     bool keyOffAffectsPorta(int ch);
+    float getPostAmp();
     int getPortaFloor(int ch);
     void setFlags(const DivConfig& flags);
     void notifyInsDeletion(void* ins);

src/engine/platform/x1_010.cpp

@@ -903,6 +903,10 @@ bool DivPlatformX1_010::keyOffAffectsArp(int ch) {
   return true;
 }
 
+float DivPlatformX1_010::getPostAmp() {
+  return 4.0f;
+}
+
 void DivPlatformX1_010::notifyWaveChange(int wave) {
   for (int i=0; i<16; i++) {
     if (chan[i].wave==wave) {

src/engine/platform/x1_010.h

@@ -140,6 +140,7 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
     void muteChannel(int ch, bool mute);
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
+    float getPostAmp();
     void setFlags(const DivConfig& flags);
     void notifyWaveChange(int wave);
     void notifyInsDeletion(void* ins);

src/engine/vgmOps.cpp

@@ -1046,7 +1046,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
       case DIV_SYSTEM_SMS:
         if (!hasSN) {
           hasSN=disCont[i].dispatch->chipClock;
-          CHIP_VOL(0,2.0);
+          CHIP_VOL(0,4.0);
           willExport[i]=true;
           switch (song.systemFlags[i].getInt("chipType",0)) {
             case 1: // real SN
@@ -1065,7 +1065,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
         } else if (!(hasSN&0x40000000)) {
           isSecond[i]=true;
           willExport[i]=true;
-          CHIP_VOL_SECOND(0,2.0);
+          CHIP_VOL_SECOND(0,4.0);
           hasSN|=0x40000000;
           howManyChips++;
         }
@@ -1130,12 +1130,12 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
       case DIV_SYSTEM_X1_010:
         if (!hasX1) {
           hasX1=disCont[i].dispatch->chipClock;
-          CHIP_VOL(38,0.5);
+          CHIP_VOL(38,2.0);
           willExport[i]=true;
           writeX1010[0]=disCont[i].dispatch;
         } else if (!(hasX1&0x40000000)) {
           isSecond[i]=true;
-          CHIP_VOL_SECOND(38,0.5);
+          CHIP_VOL_SECOND(38,2.0);
           willExport[i]=true;
           writeX1010[1]=disCont[i].dispatch;
           hasX1|=0x40000000;
@@ -1232,12 +1232,12 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
       case DIV_SYSTEM_YM2612_DUALPCM_EXT:
         if (!hasOPN2) {
           hasOPN2=disCont[i].dispatch->chipClock;
-          CHIP_VOL(2,0.8);
+          CHIP_VOL(2,1.6);
           willExport[i]=true;
           writeDACSamples=true;
         } else if (!(hasOPN2&0x40000000)) {
           isSecond[i]=true;
-          CHIP_VOL_SECOND(2,0.8);
+          CHIP_VOL_SECOND(2,1.6);
           willExport[i]=true;
           hasOPN2|=0x40000000;
           howManyChips++;
@@ -1296,11 +1296,11 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
       case DIV_SYSTEM_VRC7:
         if (!hasOPLL) {
           hasOPLL=disCont[i].dispatch->chipClock;
-          CHIP_VOL(1,1.6);
+          CHIP_VOL(1,3.2);
           willExport[i]=true;
         } else if (!(hasOPLL&0x40000000)) {
           isSecond[i]=true;
-          CHIP_VOL_SECOND(1,1.6);
+          CHIP_VOL_SECOND(1,3.2);
           willExport[i]=true;
           hasOPLL|=0x40000000;
           howManyChips++;