diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index e8a28512..6ee69145 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1015,9 +1015,17 @@ void DivEngine::renderSamples() {
   sPreview.pos=0;
   sPreview.dir=false;
 
+  // step 0: make sample format mask
+  unsigned int formatMask=1U<<16; // 16-bit is always on
+  for (int i=0; i<song.systemLen; i++) {
+    const DivSysDef* s=getSystemDef(song.system[i]);
+    if (s==NULL) continue;
+    formatMask|=s->sampleFormatMask;
+  }
+
   // step 1: render samples
   for (int i=0; i<song.sampleLen; i++) {
-    song.sample[i]->render();
+    song.sample[i]->render(formatMask);
   }
 
   // step 2: render samples to dispatch
diff --git a/src/engine/engine.h b/src/engine/engine.h
index ff01d2e1..0e56b12f 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -227,6 +227,7 @@ struct DivSysDef {
   int channels;
   bool isFM, isSTD, isCompound;
   unsigned int vgmVersion;
+  unsigned int sampleFormatMask;
   const char* chanNames[DIV_MAX_CHANS];
   const char* chanShortNames[DIV_MAX_CHANS];
   int chanTypes[DIV_MAX_CHANS];
@@ -237,7 +238,7 @@ struct DivSysDef {
   const EffectHandlerMap postEffectHandlers;
   DivSysDef(
     const char* sysName, const char* sysNameJ, unsigned char fileID, unsigned char fileID_DMF, int chans,
-    bool isFMChip, bool isSTDChip, unsigned int vgmVer, bool compound, const char* desc,
+    bool isFMChip, bool isSTDChip, unsigned int vgmVer, bool compound, unsigned int formatMask, const char* desc,
     std::initializer_list<const char*> chNames,
     std::initializer_list<const char*> chShortNames,
     std::initializer_list<int> chTypes,
@@ -255,6 +256,7 @@ struct DivSysDef {
     isSTD(isSTDChip),
     isCompound(compound),
     vgmVersion(vgmVer),
+    sampleFormatMask(formatMask),
     effectHandlers(fxHandlers_),
     postEffectHandlers(postFxHandlers_) {
     memset(chanNames,0,DIV_MAX_CHANS*sizeof(void*));
diff --git a/src/engine/platform/ay.cpp b/src/engine/platform/ay.cpp
index ad133c08..2719f0bb 100644
--- a/src/engine/platform/ay.cpp
+++ b/src/engine/platform/ay.cpp
@@ -115,7 +115,7 @@ const unsigned char dacLogTableAY[256]={
 
 void DivPlatformAY8910::runDAC() {
   for (int i=0; i<3; i++) {
-    if (chan[i].active && chan[i].psgMode.dac && chan[i].dac.sample!=-1) {
+    if (chan[i].active && chan[i].currPSGMode.dac && chan[i].dac.sample!=-1) {
       chan[i].dac.period+=chan[i].dac.rate;
       bool end=false;
       bool changed=false;
@@ -215,22 +215,22 @@ void DivPlatformAY8910::acquire(short* bufL, short* bufR, size_t start, size_t l
 void DivPlatformAY8910::updateOutSel(bool immediate) {
   if (immediate) {
     immWrite(0x07,
-          ~((chan[0].psgMode.getTone())|
-           ((chan[1].psgMode.getTone())<<1)|
-           ((chan[2].psgMode.getTone())<<2)|
-           ((chan[0].psgMode.getNoise())<<2)|
-           ((chan[1].psgMode.getNoise())<<3)|
-           ((chan[2].psgMode.getNoise())<<4)|
+          ~((chan[0].currPSGMode.getTone())|
+           ((chan[1].currPSGMode.getTone())<<1)|
+           ((chan[2].currPSGMode.getTone())<<2)|
+           ((chan[0].currPSGMode.getNoise())<<2)|
+           ((chan[1].currPSGMode.getNoise())<<3)|
+           ((chan[2].currPSGMode.getNoise())<<4)|
            ((!ioPortA)<<6)|
            ((!ioPortB)<<7)));
   } else {
     rWrite(0x07,
-          ~((chan[0].psgMode.getTone())|
-           ((chan[1].psgMode.getTone())<<1)|
-           ((chan[2].psgMode.getTone())<<2)|
-           ((chan[0].psgMode.getNoise())<<2)|
-           ((chan[1].psgMode.getNoise())<<3)|
-           ((chan[2].psgMode.getNoise())<<4)|
+          ~((chan[0].currPSGMode.getTone())|
+           ((chan[1].currPSGMode.getTone())<<1)|
+           ((chan[2].currPSGMode.getTone())<<2)|
+           ((chan[0].currPSGMode.getNoise())<<2)|
+           ((chan[1].currPSGMode.getNoise())<<3)|
+           ((chan[2].currPSGMode.getNoise())<<4)|
            ((!ioPortA)<<6)|
            ((!ioPortB)<<7)));
   }
@@ -243,13 +243,13 @@ void DivPlatformAY8910::tick(bool sysTick) {
     if (chan[i].std.vol.had) {
       chan[i].outVol=MIN(15,chan[i].std.vol.val)-(15-(chan[i].vol&15));
       if (chan[i].outVol<0) chan[i].outVol=0;
-      if (!chan[i].psgMode.dac) {
+      if (!chan[i].nextPSGMode.dac) {
         if (isMuted[i]) {
           rWrite(0x08+i,0);
-        } else if (intellivision && (chan[i].psgMode.getEnvelope())) {
+        } else if (intellivision && (chan[i].nextPSGMode.getEnvelope())) {
           rWrite(0x08+i,(chan[i].outVol&0xc)<<2);
         } else {
-          rWrite(0x08+i,(chan[i].outVol&15)|((chan[i].psgMode.getEnvelope())<<2));
+          rWrite(0x08+i,(chan[i].outVol&15)|((chan[i].nextPSGMode.getEnvelope())<<2));
         }
       }
     }
@@ -263,14 +263,17 @@ void DivPlatformAY8910::tick(bool sysTick) {
       rWrite(0x06,31-chan[i].std.duty.val);
     }
     if (chan[i].std.wave.had) {
-      if (!chan[i].psgMode.dac) {
-        chan[i].psgMode.val=(chan[i].std.wave.val+1)&7;
+      if (!chan[i].nextPSGMode.dac) {
+        chan[i].nextPSGMode.val=(chan[i].std.wave.val+1)&7;
+        if (chan[i].active) {
+          chan[i].currPSGMode.val=chan[i].nextPSGMode.val;
+        }
         if (isMuted[i]) {
           rWrite(0x08+i,0);
-        } else if (intellivision && (chan[i].psgMode.getEnvelope())) {
+        } else if (intellivision && (chan[i].nextPSGMode.getEnvelope())) {
           rWrite(0x08+i,(chan[i].outVol&0xc)<<2);
         } else {
-          rWrite(0x08+i,(chan[i].outVol&15)|((chan[i].psgMode.getEnvelope())<<2));
+          rWrite(0x08+i,(chan[i].outVol&15)|((chan[i].nextPSGMode.getEnvelope())<<2));
         }
       }
     }
@@ -285,7 +288,7 @@ void DivPlatformAY8910::tick(bool sysTick) {
     }
     if (chan[i].std.phaseReset.had) {
       if (chan[i].std.phaseReset.val==1) {
-        if (chan[i].psgMode.dac) {
+        if (chan[i].nextPSGMode.dac) {
           if (dumpWrites) addWrite(0xffff0002+(i<<8),0);
           DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_AY);
           chan[i].dac.sample=ins->amiga.getSample(chan[i].note);
@@ -336,12 +339,12 @@ void DivPlatformAY8910::tick(bool sysTick) {
       if (chan[i].keyOn) {
         //rWrite(16+i*5+1,((chan[i].duty&3)<<6)|(63-(ins->gb.soundLen&63)));
         //rWrite(16+i*5+2,((chan[i].vol<<4))|(ins->gb.envLen&7)|((ins->gb.envDir&1)<<3));
-        if (chan[i].psgMode.val==0) {
-          chan[i].psgMode.val=1;
+        if (!chan[i].nextPSGMode.dac) {
+          chan[i].currPSGMode.val=chan[i].nextPSGMode.val;
         }
       }
       if (chan[i].keyOff) {
-        chan[i].psgMode.val=0;
+        chan[i].currPSGMode.val=0;
         rWrite(0x08+i,0);
       }
       rWrite((i)<<1,chan[i].freq&0xff);
@@ -392,11 +395,11 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AY);
       if (!parent->song.disableSampleMacro && (ins->type==DIV_INS_AMIGA || ins->amiga.useSample)) {
-        chan[c.chan].psgMode.dac=true;
+        chan[c.chan].nextPSGMode.dac=true;
       } else if (chan[c.chan].dac.furnaceDAC) {
-        chan[c.chan].psgMode.dac=false;
+        chan[c.chan].nextPSGMode.dac=false;
       }
-      if (chan[c.chan].psgMode.dac) {
+      if (chan[c.chan].nextPSGMode.dac) {
         if (skipRegisterWrites) break;
         if (!parent->song.disableSampleMacro && (ins->type==DIV_INS_AMIGA || ins->amiga.useSample)) {
           chan[c.chan].dac.sample=ins->amiga.getSample(c.value);
@@ -445,6 +448,7 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
           }
           chan[c.chan].dac.furnaceDAC=false;
         }
+        chan[c.chan].currPSGMode.dac=chan[c.chan].nextPSGMode.dac;
         break;
       }
       if (c.value!=DIV_NOTE_NULL) {
@@ -458,13 +462,13 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
       if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
         chan[c.chan].outVol=chan[c.chan].vol;
       }
-      if (!chan[c.chan].psgMode.dac) {
+      if (!chan[c.chan].nextPSGMode.dac) {
         if (isMuted[c.chan]) {
           rWrite(0x08+c.chan,0);
-        } else if (intellivision && (chan[c.chan].psgMode.getEnvelope())) {
+        } else if (intellivision && (chan[c.chan].nextPSGMode.getEnvelope())) {
           rWrite(0x08+c.chan,(chan[c.chan].vol&0xc)<<2);
         } else {
-          rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].psgMode.getEnvelope())<<2));
+          rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].nextPSGMode.getEnvelope())<<2));
         }
       }
       break;
@@ -472,7 +476,7 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_OFF:
       chan[c.chan].dac.sample=-1;
       if (dumpWrites) addWrite(0xffff0002+(c.chan<<8),0);
-      chan[c.chan].psgMode.dac=false;
+      chan[c.chan].nextPSGMode.dac=false;
       chan[c.chan].keyOff=true;
       chan[c.chan].active=false;
       chan[c.chan].macroInit(NULL);
@@ -486,15 +490,15 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
       if (!chan[c.chan].std.vol.has) {
         chan[c.chan].outVol=c.value;
       }
-      if (!chan[c.chan].psgMode.dac) {
+      if (!chan[c.chan].nextPSGMode.dac) {
         if (isMuted[c.chan]) {
           rWrite(0x08+c.chan,0);
         } else {
           if (chan[c.chan].active) {
-            if (intellivision && (chan[c.chan].psgMode.getEnvelope())) {
+            if (intellivision && (chan[c.chan].nextPSGMode.getEnvelope())) {
               rWrite(0x08+c.chan,(chan[c.chan].vol&0xc)<<2);
             } else {
-              rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].psgMode.getEnvelope())<<2));
+              rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].nextPSGMode.getEnvelope())<<2));
             }
           }
         }
@@ -545,16 +549,19 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_STD_NOISE_MODE:
-      if (!chan[c.chan].psgMode.dac) {
+      if (!chan[c.chan].nextPSGMode.dac) {
         if (c.value<16) {
-          chan[c.chan].psgMode.val=(c.value+1)&7;
+          chan[c.chan].nextPSGMode.val=(c.value+1)&7;
+          if (chan[c.chan].active) {
+            chan[c.chan].currPSGMode.val=chan[c.chan].nextPSGMode.val;
+          }
           if (isMuted[c.chan]) {
             rWrite(0x08+c.chan,0);
           } else if (chan[c.chan].active) {
-            if (intellivision && (chan[c.chan].psgMode.getEnvelope())) {
+            if (intellivision && (chan[c.chan].nextPSGMode.getEnvelope())) {
               rWrite(0x08+c.chan,(chan[c.chan].outVol&0xc)<<2);
             } else {
-              rWrite(0x08+c.chan,(chan[c.chan].outVol&15)|((chan[c.chan].psgMode.getEnvelope())<<2));
+              rWrite(0x08+c.chan,(chan[c.chan].outVol&15)|((chan[c.chan].nextPSGMode.getEnvelope())<<2));
             }
           }
         }
@@ -567,16 +574,19 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
       ayEnvMode=c.value>>4;
       rWrite(0x0d,ayEnvMode);
       if (c.value&15) {
-        chan[c.chan].psgMode.envelope|=1;
+        chan[c.chan].nextPSGMode.envelope|=1;
       } else {
-        chan[c.chan].psgMode.envelope&=~1;
+        chan[c.chan].nextPSGMode.envelope&=~1;
+      }
+      if (!chan[c.chan].nextPSGMode.dac && chan[c.chan].active) {
+        chan[c.chan].currPSGMode.val=chan[c.chan].nextPSGMode.val;
       }
       if (isMuted[c.chan]) {
         rWrite(0x08+c.chan,0);
-      } else if (intellivision && (chan[c.chan].psgMode.getEnvelope())) {
+      } else if (intellivision && (chan[c.chan].nextPSGMode.getEnvelope())) {
         rWrite(0x08+c.chan,(chan[c.chan].vol&0xc)<<2);
       } else {
-        rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].psgMode.getEnvelope())<<2));
+        rWrite(0x08+c.chan,(chan[c.chan].vol&15)|((chan[c.chan].nextPSGMode.getEnvelope())<<2));
       }
       break;
     case DIV_CMD_AY_ENVELOPE_LOW:
@@ -614,7 +624,10 @@ int DivPlatformAY8910::dispatch(DivCommand c) {
       immWrite(14+(c.value?1:0),(c.value?portBVal:portAVal));
       break;
     case DIV_CMD_SAMPLE_MODE:
-      chan[c.chan].psgMode.dac=(c.value>0)?1:0;
+      chan[c.chan].nextPSGMode.dac=(c.value>0)?1:0;
+      if (chan[c.chan].active) {
+        chan[c.chan].currPSGMode.dac=chan[c.chan].nextPSGMode.dac;
+      }
       break;
     case DIV_CMD_SAMPLE_BANK:
       sampleBank=c.value;
@@ -650,13 +663,13 @@ void DivPlatformAY8910::muteChannel(int ch, bool mute) {
   isMuted[ch]=mute;
   if (isMuted[ch]) {
     rWrite(0x08+ch,0);
-  } else if (chan[ch].active && chan[ch].psgMode.dac) {
+  } else if (chan[ch].active && chan[ch].nextPSGMode.dac) {
     rWrite(0x08+ch,chan[ch].dac.out);
   } else {
-    if (intellivision && (chan[ch].psgMode.getEnvelope()) && chan[ch].active) {
+    if (intellivision && (chan[ch].nextPSGMode.getEnvelope()) && chan[ch].active) {
       rWrite(0x08+ch,(chan[ch].vol&0xc)<<2);
     } else if (chan[ch].active) {
-      rWrite(0x08+ch,(chan[ch].outVol&15)|((chan[ch].psgMode.getEnvelope())<<2));
+      rWrite(0x08+ch,(chan[ch].outVol&15)|((chan[ch].nextPSGMode.getEnvelope())<<2));
     }
   }
 }
diff --git a/src/engine/platform/ay.h b/src/engine/platform/ay.h
index e359b3d7..6a8dbc3d 100644
--- a/src/engine/platform/ay.h
+++ b/src/engine/platform/ay.h
@@ -54,9 +54,11 @@ class DivPlatformAY8910: public DivDispatch {
           return dac?0:(envelope<<2);
         }
 
-        PSGMode():
-          val(1) {}
-      } psgMode;
+        PSGMode(unsigned char v=0):
+          val(v) {}
+      };
+      PSGMode currPSGMode;
+      PSGMode nextPSGMode;
 
       struct DAC {
         int sample, rate, period, pos, out;
@@ -83,7 +85,8 @@ class DivPlatformAY8910: public DivDispatch {
         pitch2=0;
       }
       Channel():
-        psgMode(PSGMode()),
+        currPSGMode(PSGMode(0)),
+        nextPSGMode(PSGMode(1)),
         dac(DAC()),
         freq(0),
         baseFreq(0),
diff --git a/src/engine/platform/ay8930.cpp b/src/engine/platform/ay8930.cpp
index 412d53f9..8bb34ae9 100644
--- a/src/engine/platform/ay8930.cpp
+++ b/src/engine/platform/ay8930.cpp
@@ -111,7 +111,7 @@ const unsigned char dacLogTableAY8930[256]={
 
 void DivPlatformAY8930::runDAC() {
   for (int i=0; i<3; i++) {
-    if (chan[i].active && chan[i].psgMode.dac && chan[i].dac.sample!=-1) {
+    if (chan[i].active && chan[i].currPSGMode.dac && chan[i].dac.sample!=-1) {
       chan[i].dac.period+=chan[i].dac.rate;
       bool end=false;
       bool changed=false;
@@ -195,22 +195,22 @@ void DivPlatformAY8930::acquire(short* bufL, short* bufR, size_t start, size_t l
 void DivPlatformAY8930::updateOutSel(bool immediate) {
   if (immediate) {
     immWrite(0x07,
-          ~((chan[0].psgMode.getTone())|
-           ((chan[1].psgMode.getTone())<<1)|
-           ((chan[2].psgMode.getTone())<<2)|
-           ((chan[0].psgMode.getNoise())<<2)|
-           ((chan[1].psgMode.getNoise())<<3)|
-           ((chan[2].psgMode.getNoise())<<4)|
+          ~((chan[0].currPSGMode.getTone())|
+           ((chan[1].currPSGMode.getTone())<<1)|
+           ((chan[2].currPSGMode.getTone())<<2)|
+           ((chan[0].currPSGMode.getNoise())<<2)|
+           ((chan[1].currPSGMode.getNoise())<<3)|
+           ((chan[2].currPSGMode.getNoise())<<4)|
            ((!ioPortA)<<6)|
            ((!ioPortB)<<7)));
   } else {
     rWrite(0x07,
-          ~((chan[0].psgMode.getTone())|
-           ((chan[1].psgMode.getTone())<<1)|
-           ((chan[2].psgMode.getTone())<<2)|
-           ((chan[0].psgMode.getNoise())<<2)|
-           ((chan[1].psgMode.getNoise())<<3)|
-           ((chan[2].psgMode.getNoise())<<4)|
+          ~((chan[0].currPSGMode.getTone())|
+           ((chan[1].currPSGMode.getTone())<<1)|
+           ((chan[2].currPSGMode.getTone())<<2)|
+           ((chan[0].currPSGMode.getNoise())<<2)|
+           ((chan[1].currPSGMode.getNoise())<<3)|
+           ((chan[2].currPSGMode.getNoise())<<4)|
            ((!ioPortA)<<6)|
            ((!ioPortB)<<7)));
   }
@@ -235,11 +235,11 @@ void DivPlatformAY8930::tick(bool sysTick) {
     if (chan[i].std.vol.had) {
       chan[i].outVol=MIN(31,chan[i].std.vol.val)-(31-(chan[i].vol&31));
       if (chan[i].outVol<0) chan[i].outVol=0;
-      if (!chan[i].psgMode.dac) {
+      if (!chan[i].nextPSGMode.dac) {
         if (isMuted[i]) {
           rWrite(0x08+i,0);
         } else {
-          rWrite(0x08+i,(chan[i].outVol&31)|((chan[i].psgMode.getEnvelope())<<3));
+          rWrite(0x08+i,(chan[i].outVol&31)|((chan[i].nextPSGMode.getEnvelope())<<3));
         }
       }
     }
@@ -253,13 +253,16 @@ void DivPlatformAY8930::tick(bool sysTick) {
       rWrite(0x06,chan[i].std.duty.val);
     }
     if (chan[i].std.wave.had) {
-      if (!chan[i].psgMode.dac) {
-      chan[i].psgMode.val=(chan[i].std.wave.val+1)&7;
-      if (isMuted[i]) {
-        rWrite(0x08+i,0);
-      } else {
-        rWrite(0x08+i,(chan[i].outVol&31)|((chan[i].psgMode.getEnvelope())<<3));
-      }
+      if (!chan[i].nextPSGMode.dac) {
+        chan[i].nextPSGMode.val=(chan[i].std.wave.val+1)&7;
+        if (chan[i].active) {
+          chan[i].currPSGMode.val=chan[i].nextPSGMode.val;
+        }
+        if (isMuted[i]) {
+          rWrite(0x08+i,0);
+        } else {
+          rWrite(0x08+i,(chan[i].outVol&31)|((chan[i].nextPSGMode.getEnvelope())<<3));
+        }
       }
     }
     if (chan[i].std.pitch.had) {
@@ -273,7 +276,7 @@ void DivPlatformAY8930::tick(bool sysTick) {
     }
     if (chan[i].std.phaseReset.had) {
       if (chan[i].std.phaseReset.val==1) {
-        if (chan[i].psgMode.dac) {
+        if (chan[i].nextPSGMode.dac) {
           if (dumpWrites) addWrite(0xffff0002+(i<<8),0);
           DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_AY8930);
           chan[i].dac.sample=ins->amiga.getSample(chan[i].note);
@@ -333,8 +336,8 @@ void DivPlatformAY8930::tick(bool sysTick) {
       }
       if (chan[i].freq>65535) chan[i].freq=65535;
       if (chan[i].keyOn) {
-        if (chan[i].psgMode.val==0) {
-          chan[i].psgMode.val=1;
+        if (!chan[i].nextPSGMode.dac) {
+          chan[i].currPSGMode.val=chan[i].nextPSGMode.val;
         }
         if (chan[i].insChanged) {
           if (!chan[i].std.ex1.will) immWrite(0x16+i,chan[i].duty);
@@ -342,7 +345,7 @@ void DivPlatformAY8930::tick(bool sysTick) {
         }
       }
       if (chan[i].keyOff) {
-        chan[i].psgMode.val=0;
+        chan[i].currPSGMode.val=0;
         rWrite(0x08+i,0);
       }
       rWrite((i)<<1,chan[i].freq&0xff);
@@ -393,11 +396,11 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AY8930);
       if (ins->type==DIV_INS_AMIGA || ins->amiga.useSample) {
-        chan[c.chan].psgMode.dac=true;
+        chan[c.chan].nextPSGMode.dac=true;
       } else if (chan[c.chan].dac.furnaceDAC) {
-        chan[c.chan].psgMode.dac=false;
+        chan[c.chan].nextPSGMode.dac=false;
       }
-      if (chan[c.chan].psgMode.dac) {
+      if (chan[c.chan].nextPSGMode.dac) {
         if (skipRegisterWrites) break;
         if (ins->type==DIV_INS_AMIGA || ins->amiga.useSample) {
           chan[c.chan].dac.sample=ins->amiga.getSample(c.value);
@@ -446,6 +449,7 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
           }
           chan[c.chan].dac.furnaceDAC=false;
         }
+        chan[c.chan].currPSGMode.dac=chan[c.chan].nextPSGMode.dac;
         break;
       }
       if (c.value!=DIV_NOTE_NULL) {
@@ -459,11 +463,11 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
       if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
         chan[c.chan].outVol=chan[c.chan].vol;
       }
-      if (!chan[c.chan].psgMode.dac) {
+      if (!chan[c.chan].nextPSGMode.dac) {
         if (isMuted[c.chan]) {
           rWrite(0x08+c.chan,0);
         } else {
-          rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode.getEnvelope())<<3));
+          rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].nextPSGMode.getEnvelope())<<3));
         }
       }
       break;
@@ -471,7 +475,7 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_OFF:
       chan[c.chan].dac.sample=-1;
       if (dumpWrites) addWrite(0xffff0002+(c.chan<<8),0);
-      chan[c.chan].psgMode.dac=false;
+      chan[c.chan].nextPSGMode.dac=false;
       chan[c.chan].keyOff=true;
       chan[c.chan].active=false;
       chan[c.chan].macroInit(NULL);
@@ -485,11 +489,11 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
       if (!chan[c.chan].std.vol.has) {
         chan[c.chan].outVol=c.value;
       }
-      if (!chan[c.chan].psgMode.dac) {
+      if (!chan[c.chan].nextPSGMode.dac) {
         if (isMuted[c.chan]) {
           rWrite(0x08+c.chan,0);
         } else {
-          if (chan[c.chan].active) rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode.getEnvelope())<<3));
+          if (chan[c.chan].active) rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].nextPSGMode.getEnvelope())<<3));
         }
         break;
       }
@@ -540,12 +544,15 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
     }
     case DIV_CMD_STD_NOISE_MODE:
       if (c.value<0x10) {
-        if (!chan[c.chan].psgMode.dac) {
-          chan[c.chan].psgMode.val=(c.value+1)&7;
+        if (!chan[c.chan].nextPSGMode.dac) {
+          chan[c.chan].nextPSGMode.val=(c.value+1)&7;
+          if (chan[c.chan].active) {
+            chan[c.chan].currPSGMode.val=chan[c.chan].nextPSGMode.val;
+          }
           if (isMuted[c.chan]) {
             rWrite(0x08+c.chan,0);
           } else if (chan[c.chan].active) {
-            rWrite(0x08+c.chan,(chan[c.chan].outVol&31)|((chan[c.chan].psgMode.getEnvelope())<<3));
+            rWrite(0x08+c.chan,(chan[c.chan].outVol&31)|((chan[c.chan].nextPSGMode.getEnvelope())<<3));
           }
         }
       } else {
@@ -560,14 +567,17 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
       chan[c.chan].envelope.mode=c.value>>4;
       rWrite(regMode[c.chan],chan[c.chan].envelope.mode);
       if (c.value&15) {
-        chan[c.chan].psgMode.envelope|=1;
+        chan[c.chan].nextPSGMode.envelope|=1;
       } else {
-        chan[c.chan].psgMode.envelope&=~1;
+        chan[c.chan].nextPSGMode.envelope&=~1;
+      }
+      if (!chan[c.chan].nextPSGMode.dac && chan[c.chan].active) {
+        chan[c.chan].currPSGMode.val=chan[c.chan].nextPSGMode.val;
       }
       if (isMuted[c.chan]) {
         rWrite(0x08+c.chan,0);
       } else {
-        rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].psgMode.getEnvelope())<<3));
+        rWrite(0x08+c.chan,(chan[c.chan].vol&31)|((chan[c.chan].nextPSGMode.getEnvelope())<<3));
       }
       break;
     case DIV_CMD_AY_ENVELOPE_LOW:
@@ -616,7 +626,8 @@ int DivPlatformAY8930::dispatch(DivCommand c) {
       immWrite(14+(c.value?1:0),(c.value?portBVal:portAVal));
       break;
     case DIV_CMD_SAMPLE_MODE:
-      chan[c.chan].psgMode.dac=(c.value>0)?1:0;
+      chan[c.chan].nextPSGMode.dac=(c.value>0)?1:0;
+      chan[c.chan].currPSGMode.dac=chan[c.chan].nextPSGMode.dac;
       break;
     case DIV_CMD_SAMPLE_BANK:
       sampleBank=c.value;
@@ -651,10 +662,10 @@ void DivPlatformAY8930::muteChannel(int ch, bool mute) {
   if (isMuted[ch]) {
     rWrite(0x08+ch,0);
   } else if (chan[ch].active) {
-    if (chan[ch].psgMode.dac) {
+    if (chan[ch].nextPSGMode.dac) {
       rWrite(0x08+ch,chan[ch].dac.out&31);
     } else {
-      rWrite(0x08+ch,(chan[ch].outVol&31)|((chan[ch].psgMode.getEnvelope())<<3));
+      rWrite(0x08+ch,(chan[ch].outVol&31)|((chan[ch].nextPSGMode.getEnvelope())<<3));
     }
   }
 }
diff --git a/src/engine/platform/ay8930.h b/src/engine/platform/ay8930.h
index fdfaa7a6..2ec12c31 100644
--- a/src/engine/platform/ay8930.h
+++ b/src/engine/platform/ay8930.h
@@ -62,9 +62,11 @@ class DivPlatformAY8930: public DivDispatch {
           return dac?0:(envelope<<2);
         }
 
-        PSGMode():
-          val(1) {}
-      } psgMode;
+        PSGMode(unsigned char v=0):
+          val(v) {}
+      };
+      PSGMode currPSGMode;
+      PSGMode nextPSGMode;
 
       struct DAC {
         int sample, rate, period, pos, out;
@@ -92,7 +94,8 @@ class DivPlatformAY8930: public DivDispatch {
       }
       Channel():
         envelope(Envelope()),
-        psgMode(PSGMode()),
+        currPSGMode(PSGMode(0)),
+        nextPSGMode(PSGMode(1)),
         dac(DAC()),
         freq(0),
         baseFreq(0),
diff --git a/src/engine/sample.cpp b/src/engine/sample.cpp
index 6839a370..f4a0d98b 100644
--- a/src/engine/sample.cpp
+++ b/src/engine/sample.cpp
@@ -814,7 +814,9 @@ bool DivSample::resample(double r, int filter) {
   return false;
 }
 
-void DivSample::render() {
+#define NOT_IN_FORMAT(x) (depth!=x && formatMask&(1U<<(unsigned int)x))
+
+void DivSample::render(unsigned int formatMask) {
   // step 1: convert to 16-bit if needed
   if (depth!=DIV_SAMPLE_DEPTH_16BIT) {
     if (!initInternal(DIV_SAMPLE_DEPTH_16BIT,samples)) return;
@@ -863,7 +865,7 @@ void DivSample::render() {
   }
 
   // step 2: render to other formats
-  if (depth!=DIV_SAMPLE_DEPTH_1BIT) { // 1-bit
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_1BIT)) { // 1-bit
     if (!initInternal(DIV_SAMPLE_DEPTH_1BIT,samples)) return;
     for (unsigned int i=0; i<samples; i++) {
       if (data16[i]>0) {
@@ -871,7 +873,7 @@ void DivSample::render() {
       }
     }
   }
-  if (depth!=DIV_SAMPLE_DEPTH_1BIT_DPCM) { // DPCM
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_1BIT_DPCM)) { // DPCM
     if (!initInternal(DIV_SAMPLE_DEPTH_1BIT_DPCM,samples)) return;
     int accum=63;
     for (unsigned int i=0; i<samples; i++) {
@@ -886,34 +888,34 @@ void DivSample::render() {
       if (accum>127) accum=127;
     }
   }
-  if (depth!=DIV_SAMPLE_DEPTH_YMZ_ADPCM) { // YMZ ADPCM
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_YMZ_ADPCM)) { // YMZ ADPCM
     if (!initInternal(DIV_SAMPLE_DEPTH_YMZ_ADPCM,samples)) return;
     ymz_encode(data16,dataZ,(samples+7)&(~0x7));
   }
-  if (depth!=DIV_SAMPLE_DEPTH_QSOUND_ADPCM) { // QSound ADPCM
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_QSOUND_ADPCM)) { // QSound ADPCM
     if (!initInternal(DIV_SAMPLE_DEPTH_QSOUND_ADPCM,samples)) return;
     bs_encode(data16,dataQSoundA,samples);
   }
   // TODO: pad to 256.
-  if (depth!=DIV_SAMPLE_DEPTH_ADPCM_A) { // ADPCM-A
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_ADPCM_A)) { // ADPCM-A
     if (!initInternal(DIV_SAMPLE_DEPTH_ADPCM_A,samples)) return;
     yma_encode(data16,dataA,(samples+511)&(~0x1ff));
   }
-  if (depth!=DIV_SAMPLE_DEPTH_ADPCM_B) { // ADPCM-B
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_ADPCM_B)) { // ADPCM-B
     if (!initInternal(DIV_SAMPLE_DEPTH_ADPCM_B,samples)) return;
     ymb_encode(data16,dataB,(samples+511)&(~0x1ff));
   }
-  if (depth!=DIV_SAMPLE_DEPTH_8BIT) { // 8-bit PCM
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_8BIT)) { // 8-bit PCM
     if (!initInternal(DIV_SAMPLE_DEPTH_8BIT,samples)) return;
     for (unsigned int i=0; i<samples; i++) {
       data8[i]=data16[i]>>8;
     }
   }
-  if (depth!=DIV_SAMPLE_DEPTH_BRR) { // BRR
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_BRR)) { // BRR
     if (!initInternal(DIV_SAMPLE_DEPTH_BRR,samples)) return;
     brrEncode(data16,dataBRR,(samples+15)&(~15),loop?loopStart:-1);
   }
-  if (depth!=DIV_SAMPLE_DEPTH_VOX) { // VOX
+  if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_VOX)) { // VOX
     if (!initInternal(DIV_SAMPLE_DEPTH_VOX,samples)) return;
     oki_encode(data16,dataVOX,samples);
   }
diff --git a/src/engine/sample.h b/src/engine/sample.h
index 3a054304..30b4c0dd 100644
--- a/src/engine/sample.h
+++ b/src/engine/sample.h
@@ -248,7 +248,7 @@ struct DivSample {
   /**
    * initialize the rest of sample formats for this sample.
    */
-  void render();
+  void render(unsigned int formatMask=0xffffffff);
 
   /**
    * get the sample data for the current depth.
diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index cd8d369a..7cc9d65b 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -594,8 +594,9 @@ void DivEngine::registerSystems() {
 
   // SysDefs
 
+  // this chip uses YMZ ADPCM, but the emulator uses ADPCM-B because I got it wrong back then.
   sysDefs[DIV_SYSTEM_YMU759]=new DivSysDef(
-    "Yamaha YMU759 (MA-2)", NULL, 0x01, 0x01, 17, true, false, 0, false,
+    "Yamaha YMU759 (MA-2)", NULL, 0x01, 0x01, 17, true, false, 0, false, (1U<<DIV_SAMPLE_DEPTH_YMZ_ADPCM)|(1U<<DIV_SAMPLE_DEPTH_ADPCM_B),
     "a chip which found its way inside mobile phones in the 2000's.\nas proprietary as it is, it passed away after losing to MP3 in the mobile hardware battle.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16", "PCM"        }, // name
     {"1",         "2",         "3",         "4",         "5",         "6",         "7",         "8",         "9",         "10",         "11",         "12",         "13",         "14",         "15",         "16",         "PCM"        }, // short
@@ -604,19 +605,19 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_GENESIS]=new DivSysDef(
-    "Sega Genesis/Mega Drive", "セガメガドライブ", 0x02, 0x02, 10, true, true, 0, true,
+    "Sega Genesis/Mega Drive", "セガメガドライブ", 0x02, 0x02, 10, true, true, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_GENESIS_EXT]=new DivSysDef(
-    "Sega Genesis Extended Channel 3", NULL, 0x42, 0x42, 13, true, true, 0, true,
+    "Sega Genesis Extended Channel 3", NULL, 0x42, 0x42, 13, true, true, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_SMS]=new DivSysDef(
-    "TI SN76489", NULL, 0x03, 0x03, 4, false, true, 0x150, false,
+    "TI SN76489", NULL, 0x03, 0x03, 4, false, true, 0x150, false, 0,
     "a square/noise sound chip found on the Sega Master System, ColecoVision, Tandy, TI's own 99/4A and a few other places.",
     {"Square 1", "Square 2", "Square 3", "Noise"},
     {"S1", "S2", "S3", "NO"},
@@ -629,13 +630,13 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SMS_OPLL]=new DivSysDef(
-    "Sega Master System + FM Expansion", NULL, 0x43, 0x43, 13, true, true, 0, true,
+    "Sega Master System + FM Expansion", NULL, 0x43, 0x43, 13, true, true, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_GB]=new DivSysDef(
-    "Game Boy", NULL, 0x04, 0x04, 4, false, true, 0x161, false,
+    "Game Boy", NULL, 0x04, 0x04, 4, false, true, 0x161, false, 0,
     "the most popular portable game console of the era.",
     {"Pulse 1", "Pulse 2", "Wavetable", "Noise"},
     {"S1", "S2", "WA", "NO"},
@@ -652,7 +653,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PCE]=new DivSysDef(
-    "PC Engine/TurboGrafx-16", NULL, 0x05, 0x05, 6, false, true, 0x161, false,
+    "PC Engine/TurboGrafx-16", NULL, 0x05, 0x05, 6, false, true, 0x161, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "an '80's game console with a wavetable sound chip, popular in Japan.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6"},
@@ -669,7 +670,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_NES]=new DivSysDef(
-    "NES (Ricoh 2A03)", NULL, 0x06, 0x06, 5, false, true, 0x161, false,
+    "NES (Ricoh 2A03)", NULL, 0x06, 0x06, 5, false, true, 0x161, false, (1U<<DIV_SAMPLE_DEPTH_1BIT_DPCM)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "also known as Famicom in Japan, it's the most well-known game console of the '80's.",
     {"Pulse 1", "Pulse 2", "Triangle", "Noise", "PCM"},
     {"S1", "S2", "TR", "NO", "PCM"},
@@ -686,19 +687,19 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_NES_VRC7]=new DivSysDef(
-    "NES + Konami VRC7", NULL, 0x46, 0x46, 11, true, true, 0, true,
+    "NES + Konami VRC7", NULL, 0x46, 0x46, 11, true, true, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_NES_FDS]=new DivSysDef(
-    "Famicom Disk System", NULL, 0, 0x86, 6, false, true, 0, true,
+    "Famicom Disk System", NULL, 0, 0x86, 6, false, true, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_C64_6581]=new DivSysDef(
-    "Commodore 64 (6581)", NULL, 0x47, 0x47, 3, false, true, 0, false,
+    "Commodore 64 (6581)", NULL, 0x47, 0x47, 3, false, true, 0, false, 0,
     "this computer is powered by the SID chip, which had synthesizer features like a filter and ADSR.",
     {"Channel 1", "Channel 2", "Channel 3"},
     {"CH1", "CH2", "CH3"},
@@ -710,7 +711,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_C64_8580]=new DivSysDef(
-    "Commodore 64 (8580)", NULL, 0x07, 0x07, 3, false, true, 0, false,
+    "Commodore 64 (8580)", NULL, 0x07, 0x07, 3, false, true, 0, false, 0,
     "this computer is powered by the SID chip, which had synthesizer features like a filter and ADSR.\nthis is the newer revision of the chip.",
     {"Channel 1", "Channel 2", "Channel 3"},
     {"CH1", "CH2", "CH3"},
@@ -722,13 +723,13 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_ARCADE]=new DivSysDef(
-    "DefleCade", NULL, 0x08, 0x08, 13, true, false, 0, true,
+    "DefleCade", NULL, 0x08, 0x08, 13, true, false, 0, true, 0,
     "<COMPOUND SYSTEM!>",
     {}, {}, {}, {}
   );
 
   sysDefs[DIV_SYSTEM_YM2610]=new DivSysDef(
-    "Neo Geo CD", NULL, 0x09, 0x09, 13, true, true, 0x151, false,
+    "Neo Geo CD", NULL, 0x09, 0x09, 13, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "like Neo Geo, but lacking the ADPCM-B channel since they couldn't connect the pins.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6"},
     {"F1", "F2", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6"},
@@ -740,7 +741,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610_EXT]=new DivSysDef(
-    "Neo Geo CD Extended Channel 2", NULL, 0x49, 0x49, 16, true, true, 0x151, false,
+    "Neo Geo CD Extended Channel 2", NULL, 0x49, 0x49, 16, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "like Neo Geo, but lacking the ADPCM-B channel since they couldn't connect the pins.\nthis one is in Extended Channel mode, which turns the second FM channel into four operators with independent notes/frequencies.",
     {"FM 1", "FM 2 OP1", "FM 2 OP2", "FM 2 OP3", "FM 2 OP4", "FM 3", "FM 4", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6"},
     {"F1", "O1", "O2", "O3", "O4", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6"},
@@ -752,7 +753,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_AY8910]=new DivSysDef(
-    "AY-3-8910", NULL, 0x80, 0, 3, false, true, 0x151, false,
+    "AY-3-8910", NULL, 0x80, 0, 3, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this chip is everywhere! ZX Spectrum, MSX, Amstrad CPC, Intellivision, Vectrex...\nthe discovery of envelope bass helped it beat the SN76489 with ease.",
     {"PSG 1", "PSG 2", "PSG 3"},
     {"S1", "S2", "S3"},
@@ -764,7 +765,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_AMIGA]=new DivSysDef(
-    "Amiga", NULL, 0x81, 0, 4, false, true, 0, false,
+    "Amiga", NULL, 0x81, 0, 4, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "a computer from the '80's with full sampling capabilities, giving it a sound ahead of its time.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
     {"CH1", "CH2", "CH3", "CH4"},
@@ -780,7 +781,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2151]=new DivSysDef(
-    "Yamaha YM2151 (OPM)", NULL, 0x82, 0, 8, true, false, 0x150, false,
+    "Yamaha YM2151 (OPM)", NULL, 0x82, 0, 8, true, false, 0x150, false, 0,
     "this was Yamaha's first integrated FM chip.\nit was used in several synthesizers, computers and arcade boards.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8"},
@@ -792,7 +793,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2612]=new DivSysDef(
-    "Yamaha YM2612 (OPN2)", NULL, 0x83, 0, 6, true, false, 0x150, false,
+    "Yamaha YM2612 (OPN2)", NULL, 0x83, 0, 6, true, false, 0x150, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this chip is mostly known for being in the Sega Genesis (but it also was on the FM Towns computer).",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6"},
     {"F1", "F2", "F3", "F4", "F5", "F6"},
@@ -804,7 +805,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_TIA]=new DivSysDef(
-    "Atari 2600", NULL, 0x84, 0, 2, false, true, 0, false,
+    "Atari 2600", NULL, 0x84, 0, 2, false, true, 0, false, 0,
     "it's a challenge to make music on this chip which barely has musical capabilities...",
     {"Channel 1", "Channel 2"},
     {"CH1", "CH2"},
@@ -816,7 +817,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SAA1099]=new DivSysDef(
-    "Philips SAA1099", NULL, 0x97, 0, 6, false, true, 0x171, false,
+    "Philips SAA1099", NULL, 0x97, 0, 6, false, true, 0x171, false, 0,
     "supposedly an upgrade from the AY-3-8910, this was present on the Creative Music System (Game Blaster) and SAM Coupé.",
     {"PSG 1", "PSG 2", "PSG 3", "PSG 4", "PSG 5", "PSG 6"},
     {"S1", "S2", "S3", "S4", "S5", "S6"},
@@ -832,7 +833,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_AY8930]=new DivSysDef(
-    "Microchip AY8930", NULL, 0x9a, 0, 3, false, true, 0x151, false,
+    "Microchip AY8930", NULL, 0x9a, 0, 3, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "an improved version of the AY-3-8910 with a bigger frequency range, duty cycles, configurable noise and per-channel envelopes!",
     {"PSG 1", "PSG 2", "PSG 3"},
     {"S1", "S2", "S3"},
@@ -844,7 +845,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_VIC20]=new DivSysDef(
-    "Commodore VIC-20", NULL, 0x85, 0, 4, false, true, 0, false,
+    "Commodore VIC-20", NULL, 0x85, 0, 4, false, true, 0, false, 0,
     "Commodore's successor to the PET.\nits square wave channels are more than just square...",
     {"Low", "Mid", "High", "Noise"},
     {"LO", "MID", "HI", "NO"},
@@ -855,7 +856,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PET]=new DivSysDef(
-    "Commodore PET", NULL, 0x86, 0, 1, false, true, 0, false,
+    "Commodore PET", NULL, 0x86, 0, 1, false, true, 0, false, 0,
     "one channel of 1-bit wavetable which is better (and worse) than the PC Speaker.",
     {"Wave"},
     {"PET"},
@@ -866,7 +867,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SNES]=new DivSysDef(
-    "SNES", NULL, 0x87, 0, 8, false, true, 0, false,
+    "SNES", NULL, 0x87, 0, 8, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_BRR,
     "FM? nah... samples! Nintendo's answer to Sega.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -903,7 +904,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_VRC6]=new DivSysDef(
-    "Konami VRC6", NULL, 0x88, 0, 3, false, true, 0, false,
+    "Konami VRC6", NULL, 0x88, 0, 3, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "an expansion chip for the Famicom, featuring a quirky sawtooth channel.",
     {"VRC6 1", "VRC6 2", "VRC6 Saw"},
     {"V1", "V2", "VS"},
@@ -917,7 +918,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPLL]=new DivSysDef(
-    "Yamaha YM2413 (OPLL)", NULL, 0x89, 0, 9, true, false, 0x150, false,
+    "Yamaha YM2413 (OPLL)", NULL, 0x89, 0, 9, true, false, 0x150, false, 0,
     "cost-reduced version of the OPL with 16 patches and only one of them is user-configurable.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "FM 9"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"},
@@ -929,7 +930,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_FDS]=new DivSysDef(
-    "Famicom Disk System (chip)", NULL, 0x8a, 0, 1, false, true, 0x161, false,
+    "Famicom Disk System (chip)", NULL, 0x8a, 0, 1, false, true, 0x161, false, 0,
     "a disk drive for the Famicom which also contains one wavetable channel.",
     {"FDS"},
     {"FDS"},
@@ -947,7 +948,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_MMC5]=new DivSysDef(
-    "MMC5", NULL, 0x8b, 0, 3, false, true, 0, false,
+    "MMC5", NULL, 0x8b, 0, 3, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "an expansion chip for the Famicom, featuring a little-known PCM channel.",
     {"Pulse 1", "Pulse 2", "PCM"},
     {"S1", "S2", "PCM"},
@@ -960,7 +961,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_N163]=new DivSysDef(
-    "Namco 163/C163/129/160/106/whatever", NULL, 0x8c, 0, 8, false, true, 0, false,
+    "Namco 163/C163/129/160/106/whatever", NULL, 0x8c, 0, 8, false, true, 0, false, 0,
     "an expansion chip for the Famicom, with full wavetable.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -985,7 +986,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPN]=new DivSysDef(
-    "Yamaha YM2203 (OPN)", NULL, 0x8d, 0, 6, true, true, 0x151, false,
+    "Yamaha YM2203 (OPN)", NULL, 0x8d, 0, 6, true, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "cost-reduced version of the OPM with a different register layout and no stereo...\n...but it has a built-in AY-3-8910! (actually an YM2149)",
     {"FM 1", "FM 2", "FM 3", "PSG 1", "PSG 2", "PSG 3"},
     {"F1", "F2", "F3", "S1", "S2", "S3"},
@@ -997,7 +998,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPN_EXT]=new DivSysDef(
-    "Yamaha YM2203 (OPN) Extended Channel 3", NULL, 0xb6, 0, 9, true, true, 0x151, false,
+    "Yamaha YM2203 (OPN) Extended Channel 3", NULL, 0xb6, 0, 9, true, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "cost-reduced version of the OPM with a different register layout and no stereo...\n...but it has a built-in AY-3-8910! (actually an YM2149)\nthis one is in Extended Channel mode, which turns the third FM channel into four operators with independent notes/frequencies",
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "PSG 1", "PSG 2", "PSG 3"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "S1", "S2", "S3"},
@@ -1009,7 +1010,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PC98]=new DivSysDef(
-    "Yamaha YM2608 (OPNA)", NULL, 0x8e, 0, 16, true, true, 0x151, false,
+    "Yamaha YM2608 (OPNA)", NULL, 0x8e, 0, 16, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "OPN but twice the FM channels, stereo makes a come-back and has rhythm and ADPCM channels.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Kick", "Snare", "Top", "HiHat", "Tom", "Rim", "ADPCM"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "S1", "S2", "S3", "BD", "SD", "TP", "HH", "TM", "RM", "P"},
@@ -1021,7 +1022,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PC98_EXT]=new DivSysDef(
-    "Yamaha YM2608 (OPNA) Extended Channel 3", NULL, 0xb7, 0, 19, true, true, 0x151, false,
+    "Yamaha YM2608 (OPNA) Extended Channel 3", NULL, 0xb7, 0, 19, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "OPN but twice the FM channels, stereo makes a come-back and has rhythm and ADPCM channels.\nthis one is in Extended Channel mode, which turns the third FM channel into four operators with independent notes/frequencies",
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Kick", "Snare", "Top", "HiHat", "Tom", "Rim", "ADPCM"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "F6", "S1", "S2", "S3", "BD", "SD", "TP", "HH", "TM", "RM", "P"},
@@ -1033,7 +1034,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL]=new DivSysDef(
-    "Yamaha YM3526 (OPL)", NULL, 0x8f, 0, 9, true, false, 0x151, false,
+    "Yamaha YM3526 (OPL)", NULL, 0x8f, 0, 9, true, false, 0x151, false, 0,
     "OPN, but what if you only had two operators, no stereo, no detune and a lower ADSR parameter range?",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "FM 9"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"},
@@ -1045,7 +1046,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL2]=new DivSysDef(
-    "Yamaha YM3812 (OPL2)", NULL, 0x90, 0, 9, true, false, 0x151, false,
+    "Yamaha YM3812 (OPL2)", NULL, 0x90, 0, 9, true, false, 0x151, false, 0,
     "OPL, but what if you had more waveforms to choose than the normal sine?",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "FM 9"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"},
@@ -1057,7 +1058,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL3]=new DivSysDef(
-    "Yamaha YMF262 (OPL3)", NULL, 0x91, 0, 18, true, false, 0x151, false,
+    "Yamaha YMF262 (OPL3)", NULL, 0x91, 0, 18, true, false, 0x151, false, 0,
     "OPL2, but what if you had twice the channels, 4-op mode, stereo and even more waveforms?",
     {"4OP 1", "FM 2", "4OP 3", "FM 4", "4OP 5", "FM 6", "4OP 7", "FM 8", "4OP 9", "FM 10", "4OP 11", "FM 12", "FM 13", "FM 14", "FM 15", "FM 16", "FM 17", "FM 18"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"},
@@ -1068,8 +1069,9 @@ void DivEngine::registerSystems() {
     fmOPLPostEffectHandlerMap
   );
 
+  // TODO: add 12-bit and 16-bit big endian formats
   sysDefs[DIV_SYSTEM_MULTIPCM]=new DivSysDef(
-    "MultiPCM", NULL, 0x92, 0, 28, false, true, 0, false,
+    "MultiPCM", NULL, 0x92, 0, 28, false, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT),
     "how many channels of PCM do you want?\nMultiPCM: yes",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16", "Channel 17", "Channel 18", "Channel 19", "Channel 20", "Channel 21", "Channel 22", "Channel 23", "Channel 24", "Channel 25", "Channel 26", "Channel 27", "Channel 28"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28"},
@@ -1078,7 +1080,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PCSPKR]=new DivSysDef(
-    "PC Speaker", NULL, 0x93, 0, 1, false, true, 0, false,
+    "PC Speaker", NULL, 0x93, 0, 1, false, true, 0, false, 0,
     "good luck!",
     {"Square"},
     {"SQ"},
@@ -1087,7 +1089,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_POKEY]=new DivSysDef(
-    "POKEY", NULL, 0x94, 0, 4, false, true, 0, false,
+    "POKEY", NULL, 0x94, 0, 4, false, true, 0, false, 0,
     "TIA, but better and more flexible.\nused in the Atari 8-bit family of computers (400/800/XL/XE).",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
     {"CH1", "CH2", "CH3", "CH4"},
@@ -1096,7 +1098,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_RF5C68]=new DivSysDef(
-    "Ricoh RF5C68", NULL, 0x95, 0, 8, false, true, 0x151, false,
+    "Ricoh RF5C68", NULL, 0x95, 0, 8, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this is like SNES' sound chip but without interpolation and the rest of nice bits.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -1106,7 +1108,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SWAN]=new DivSysDef(
-    "WonderSwan", NULL, 0x96, 0, 4, false, true, 0x171, false,
+    "WonderSwan", NULL, 0x96, 0, 4, false, true, 0x171, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "developed by the same team under the Game Boy and the Virtual Boy...",
     {"Wave", "Wave/PCM", "Wave", "Wave/Noise"},
     {"CH1", "CH2", "CH3", "CH4"},
@@ -1123,7 +1125,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPZ]=new DivSysDef(
-    "Yamaha YM2414 (OPZ)", NULL, 0x98, 0, 8, true, false, 0, false,
+    "Yamaha YM2414 (OPZ)", NULL, 0x98, 0, 8, true, false, 0, false, 0,
     "like OPM, but with more waveforms, fixed frequency mode and totally... undocumented.\nused in the Yamaha TX81Z and some other synthesizers.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8"},
@@ -1137,7 +1139,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_POKEMINI]=new DivSysDef(
-    "Pokémon Mini", NULL, 0x99, 0, 1, false, true, 0, false,
+    "Pokémon Mini", NULL, 0x99, 0, 1, false, true, 0, false, 0,
     "this one is like PC Speaker but has duty cycles.",
     {"Square"},
     {"SQ"},
@@ -1146,7 +1148,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SEGAPCM]=new DivSysDef(
-    "SegaPCM", NULL, 0x9b, 0, 16, false, true, 0x151, false,
+    "SegaPCM", NULL, 0x9b, 0, 16, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "used in some Sega arcade boards (like OutRun), and usually paired with a YM2151.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"},
@@ -1158,7 +1160,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_VBOY]=new DivSysDef(
-    "Virtual Boy", NULL, 0x9c, 0, 6, false, true, 0, false,
+    "Virtual Boy", NULL, 0x9c, 0, 6, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "a console which failed to sell well due to its headache-inducing features.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Noise"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "NO"},
@@ -1167,7 +1169,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_VRC7]=new DivSysDef(
-    "Konami VRC7", NULL, 0x9d, 0, 6, true, false, 0x151, false,
+    "Konami VRC7", NULL, 0x9d, 0, 6, true, false, 0x151, false, 0,
     "like OPLL, but even more cost reductions applied. three less FM channels, and no drums mode...",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6"},
     {"F1", "F2", "F3", "F4", "F5", "F6"},
@@ -1179,7 +1181,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610B]=new DivSysDef(
-    "Yamaha YM2610B (OPNB2)", NULL, 0x9e, 0, 16, true, false, 0x151, false,
+    "Yamaha YM2610B (OPNB2)", NULL, 0x9e, 0, 16, true, false, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "so Taito asked Yamaha if they could get the two missing FM channels back, and Yamaha gladly provided them with this chip.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
@@ -1191,7 +1193,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SFX_BEEPER]=new DivSysDef(
-    "ZX Spectrum Beeper", NULL, 0x9f, 0, 6, false, true, 0, false,
+    "ZX Spectrum Beeper", NULL, 0x9f, 0, 6, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_1BIT,
     "the ZX Spectrum only had a basic beeper capable of...\n...a bunch of thin pulses and tons of other interesting stuff!\nFurnace provides a thin pulse system.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6"},
@@ -1205,7 +1207,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2612_EXT]=new DivSysDef(
-    "Yamaha YM2612 (OPN2) Extended Channel 3", NULL, 0xa0, 0, 9, true, false, 0x150, false,
+    "Yamaha YM2612 (OPN2) Extended Channel 3", NULL, 0xa0, 0, 9, true, false, 0x150, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this chip is mostly known for being in the Sega Genesis (but it also was on the FM Towns computer).\nthis one is in Extended Channel mode, which turns the third FM channel into four operators with independent notes/frequencies.",
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "F6"},
@@ -1217,7 +1219,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SCC]=new DivSysDef(
-    "Konami SCC", NULL, 0xa1, 0, 5, false, true, 0x161, false,
+    "Konami SCC", NULL, 0xa1, 0, 5, false, true, 0x161, false, 0,
     "a wavetable chip made by Konami for use with the MSX.\nthe last channel shares its wavetable with the previous one though.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5"},
     {"CH1", "CH2", "CH3", "CH4", "CH5"},
@@ -1228,7 +1230,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL_DRUMS]=new DivSysDef(
-    "Yamaha YM3526 (OPL) with drums", NULL, 0xa2, 0, 11, true, false, 0x151, false,
+    "Yamaha YM3526 (OPL) with drums", NULL, 0xa2, 0, 11, true, false, 0x151, false, 0,
     "the OPL chip but with drums mode enabled.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick/FM 7", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
@@ -1240,7 +1242,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL2_DRUMS]=new DivSysDef(
-    "Yamaha YM3812 (OPL2) with drums", NULL, 0xa3, 0, 11, true, false, 0x151, false,
+    "Yamaha YM3812 (OPL2) with drums", NULL, 0xa3, 0, 11, true, false, 0x151, false, 0,
     "the OPL2 chip but with drums mode enabled.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick/FM 7", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
@@ -1252,7 +1254,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL3_DRUMS]=new DivSysDef(
-    "Yamaha YMF262 (OPL3) with drums", NULL, 0xa4, 0, 20, true, false, 0x151, false,
+    "Yamaha YMF262 (OPL3) with drums", NULL, 0xa4, 0, 20, true, false, 0x151, false, 0,
     "the OPL3 chip but with drums mode enabled.",
     {"4OP 1", "FM 2", "4OP 3", "FM 4", "4OP 5", "FM 6", "4OP 7", "FM 8", "4OP 9", "FM 10", "4OP 11", "FM 12", "FM 13", "FM 14", "FM 15", "Kick/FM 16", "Snare", "Tom", "Top", "HiHat"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "BD", "SD", "TM", "TP", "HH"},
@@ -1264,7 +1266,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610_FULL]=new DivSysDef(
-    "Yamaha YM2610 (OPNB)", NULL, 0xa5, 0, 14, true, false, 0x151, false,
+    "Yamaha YM2610 (OPNB)", NULL, 0xa5, 0, 14, true, false, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "this chip was used in SNK's Neo Geo arcade board and video game console.\nit's like OPNA but the rhythm channels are ADPCM channels and two FM channels went missing.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "F2", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
@@ -1276,7 +1278,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610_FULL_EXT]=new DivSysDef(
-    "Yamaha YM2610 (OPNB) Extended Channel 2", NULL, 0xa6, 0, 17, true, false, 0x151, false,
+    "Yamaha YM2610 (OPNB) Extended Channel 2", NULL, 0xa6, 0, 17, true, false, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "this chip was used in SNK's Neo Geo arcade board and video game console.\nit's like OPNA but the rhythm channels are ADPCM channels and two FM channels went missing.\nthis one is in Extended Channel mode, which turns the second FM channel into four operators with independent notes/frequencies.",
     {"FM 1", "FM 2 OP1", "FM 2 OP2", "FM 2 OP3", "FM 2 OP4", "FM 3", "FM 4", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "O1", "O2", "O3", "O4", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
@@ -1288,7 +1290,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPLL_DRUMS]=new DivSysDef(
-    "Yamaha YM2413 (OPLL) with drums", NULL, 0xa7, 0, 11, true, false, 0x150, false,
+    "Yamaha YM2413 (OPLL) with drums", NULL, 0xa7, 0, 11, true, false, 0x150, false, 0,
     "the OPLL chips but with drums mode turned on.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
@@ -1306,7 +1308,7 @@ void DivEngine::registerSystems() {
   }
 
   sysDefs[DIV_SYSTEM_LYNX]=new DivSysDef(
-    "Atari Lynx", NULL, 0xa8, 0, 4, false, true, 0, false,
+    "Atari Lynx", NULL, 0xa8, 0, 4, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "a portable console made by Atari. it has all of Atari's trademark waveforms.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
     {"CH1", "CH2", "CH3", "CH4"},
@@ -1328,7 +1330,7 @@ void DivEngine::registerSystems() {
   }
 
   sysDefs[DIV_SYSTEM_QSOUND]=new DivSysDef(
-    "Capcom QSound", NULL, 0xe0, 0, 19, false, true, 0x161, false,
+    "Capcom QSound", NULL, 0xe0, 0, 19, false, true, 0x161, false, (1U<<DIV_SAMPLE_DEPTH_QSOUND_ADPCM)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "used in some of Capcom's arcade boards. surround-like sampled sound with echo.",
     {"PCM 1", "PCM 2", "PCM 3", "PCM 4", "PCM 5", "PCM 6", "PCM 7", "PCM 8", "PCM 9", "PCM 10", "PCM 11", "PCM 12", "PCM 13", "PCM 14", "PCM 15", "PCM 16", "ADPCM 1", "ADPCM 2", "ADPCM 3"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "A1", "A2", "A3"},
@@ -1339,7 +1341,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_VERA]=new DivSysDef(
-    "VERA", NULL, 0xac, 0, 17, false, true, 0, false,
+    "VERA", NULL, 0xac, 0, 17, false, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT),
     "the chip used in a computer design created by The 8-Bit Guy.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16", "PCM"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "PCM"},
@@ -1353,7 +1355,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610B_EXT]=new DivSysDef(
-    "Yamaha YM2610B (OPNB2) Extended Channel 3", NULL, 0xde, 0, 19, true, false, 0x151, false,
+    "Yamaha YM2610B (OPNB2) Extended Channel 3", NULL, 0xde, 0, 19, true, false, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_ADPCM_A)|(1U<<DIV_SAMPLE_DEPTH_ADPCM_B)|(1U<<DIV_SAMPLE_DEPTH_8BIT),
     "so Taito asked Yamaha if they could get the two missing FM channels back, and Yamaha gladly provided them with this chip.\nthis one is in Extended Channel mode, which turns the third FM channel into four operators with independent notes/frequencies.",
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "F6", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
@@ -1365,7 +1367,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SEGAPCM_COMPAT]=new DivSysDef(
-    "SegaPCM (compatible 5-channel mode)", NULL, 0xa9, 0, 5, false, true, 0x151, false,
+    "SegaPCM (compatible 5-channel mode)", NULL, 0xa9, 0, 5, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this is the same thing as SegaPCM, but only exposes 5 of the channels for compatibility with DefleMask.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5"},
     {"P1", "P2", "P3", "P4", "P5"},
@@ -1377,7 +1379,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_X1_010]=new DivSysDef(
-    "Seta/Allumer X1-010", NULL, 0xb0, 0, 16, false, true, 0x171, false,
+    "Seta/Allumer X1-010", NULL, 0xb0, 0, 16, false, true, 0x171, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "a sound chip used in several Seta/Allumer-manufactured arcade boards with too many channels of wavetable sound, which also are capable of sampled sound.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"},
@@ -1401,7 +1403,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_BUBSYS_WSG]=new DivSysDef(
-    "Konami Bubble System WSG", NULL, 0xad, 0, 2, false, true, 0, false,
+    "Konami Bubble System WSG", NULL, 0xad, 0, 2, false, true, 0, false, 0,
     "this is the wavetable part of the Bubble System, which also had two AY-3-8910s.",
     {"Channel 1", "Channel 2"},
     {"CH1", "CH2"},
@@ -1412,8 +1414,9 @@ void DivEngine::registerSystems() {
   );
 
   // to Grauw: feel free to change this to 24 during development of OPL4's PCM part.
+  // TODO: add 12-bit and 16-bit big-endian sample formats
   sysDefs[DIV_SYSTEM_OPL4]=new DivSysDef(
-    "Yamaha YMF278B (OPL4)", NULL, 0xae, 0, 42, true, true, 0, false,
+    "Yamaha YMF278B (OPL4)", NULL, 0xae, 0, 42, true, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT),
     "like OPL3, but this time it also has a 24-channel version of MultiPCM.",
     {"4OP 1", "FM 2", "4OP 3", "FM 4", "4OP 5", "FM 6", "4OP 7", "FM 8", "4OP 9", "FM 10", "4OP 11", "FM 12", "FM 13", "FM 14", "FM 15", "FM 16", "FM 17", "FM 18", "PCM 1", "PCM 2", "PCM 3", "PCM 4", "PCM 5", "PCM 6", "PCM 7", "PCM 8", "PCM 9", "PCM 10", "PCM 11", "PCM 12", "PCM 13", "PCM 14", "PCM 15", "PCM 16", "PCM 17", "PCM 18", "PCM 19", "PCM 20", "PCM 21", "PCM 22", "PCM 23", "PCM 24"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P8", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
@@ -1421,8 +1424,9 @@ void DivEngine::registerSystems() {
     {DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM}
   );
 
+  // TODO: same here
   sysDefs[DIV_SYSTEM_OPL4_DRUMS]=new DivSysDef(
-    "Yamaha YMF278B (OPL4) with drums", NULL, 0xaf, 0, 44, true, true, 0, false,
+    "Yamaha YMF278B (OPL4) with drums", NULL, 0xaf, 0, 44, true, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT),
     "the OPL4 but with drums mode turned on.",
     {"4OP 1", "FM 2", "4OP 3", "FM 4", "4OP 5", "FM 6", "4OP 7", "FM 8", "4OP 9", "FM 10", "4OP 11", "FM 12", "FM 13", "FM 14", "FM 15", "Kick/FM 16", "Snare", "Tom", "Top", "HiHat", "PCM 1", "PCM 2", "PCM 3", "PCM 4", "PCM 5", "PCM 6", "PCM 7", "PCM 8", "PCM 9", "PCM 10", "PCM 11", "PCM 12", "PCM 13", "PCM 14", "PCM 15", "PCM 16", "PCM 17", "PCM 18", "PCM 19", "PCM 20", "PCM 21", "PCM 22", "PCM 23", "PCM 24"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "BD", "SD", "TM", "TP", "HH", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P8", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
@@ -1461,8 +1465,9 @@ void DivEngine::registerSystems() {
   for (int i=0; i<16; i++) es5506PreEffectHandlerMap.emplace(0x40+i, es5506K2Handler);
   for (int i=0; i<16; i++) es5506PreEffectHandlerMap.emplace(0x50+i, transWaveSlicePositionHandler);
 
+  // TODO: custom sample format
   sysDefs[DIV_SYSTEM_ES5506]=new DivSysDef(
-    "Ensoniq ES5506", NULL, 0xb1, 0, 32, false, true, 0/*0x171*/, false,
+    "Ensoniq ES5506", NULL, 0xb1, 0, 32, false, true, 0/*0x171*/, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT),
     "a sample chip used in the Ensoniq's unique TransWave synthesizers, and SoundScape series PC ISA soundcards (which are yet another (partially) Sound Blaster compatible ones with emulated OPL3 and MIDI ROMpler).",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16", "Channel 17", "Channel 18", "Channel 19", "Channel 20", "Channel 21", "Channel 22", "Channel 23", "Channel 24", "Channel 25", "Channel 26", "Channel 27", "Channel 28", "Channel 29", "Channel 30", "Channel 31", "Channel 32"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32"},
@@ -1474,7 +1479,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_Y8950]=new DivSysDef(
-    "Yamaha Y8950", NULL, 0xb2, 0, 10, true, false, 0x151, false,
+    "Yamaha Y8950", NULL, 0xb2, 0, 10, true, false, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_ADPCM_B,
     "like OPL but with an ADPCM channel.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "FM 9", "ADPCM"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "P"},
@@ -1486,7 +1491,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_Y8950_DRUMS]=new DivSysDef(
-    "Yamaha Y8950 with drums", NULL, 0xb3, 0, 12, true, false, 0x151, false,
+    "Yamaha Y8950 with drums", NULL, 0xb3, 0, 12, true, false, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_ADPCM_B,
     "the Y8950 chip, in drums mode.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick/FM 7", "Snare", "Tom", "Top", "HiHat", "ADPCM"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH", "P"},
@@ -1498,7 +1503,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_SCC_PLUS]=new DivSysDef(
-    "Konami SCC+", NULL, 0xb4, 0, 5, false, true, 0x161, false,
+    "Konami SCC+", NULL, 0xb4, 0, 5, false, true, 0x161, false, 0,
     "this is a variant of Konami's SCC chip with the last channel's wavetable being independent.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5"},
     {"CH1", "CH2", "CH3", "CH4", "CH5"},
@@ -1534,7 +1539,7 @@ void DivEngine::registerSystems() {
   }
 
   sysDefs[DIV_SYSTEM_SOUND_UNIT]=new DivSysDef(
-    "tildearrow Sound Unit", NULL, 0xb5, 0, 8, false, true, 0, false,
+    "tildearrow Sound Unit", NULL, 0xb5, 0, 8, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "tildearrow's fantasy sound chip. put SID, AY and VERA in a blender, and you get this!",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -1546,7 +1551,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_MSM6295]=new DivSysDef(
-    "OKI MSM6295", NULL, 0xaa, 0, 4, false, true, 0x161, false,
+    "OKI MSM6295", NULL, 0xaa, 0, 4, false, true, 0x161, false, 1U<<DIV_SAMPLE_DEPTH_VOX,
     "an ADPCM sound chip manufactured by OKI and used in many arcade boards.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
     {"CH1", "CH2", "CH3", "CH4"},
@@ -1559,7 +1564,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_MSM6258]=new DivSysDef(
-    "OKI MSM6258", NULL, 0xab, 0, 1, false, true, 0, false,
+    "OKI MSM6258", NULL, 0xab, 0, 1, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_VOX,
     "an ADPCM sound chip manufactured by OKI and used in the Sharp X68000.",
     {"Sample"},
     {"PCM"},
@@ -1573,7 +1578,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YMZ280B]=new DivSysDef(
-    "Yamaha YMZ280B (PCMD8)", NULL, 0xb8, 0, 8, false, true, 0x151, false,
+    "Yamaha YMZ280B (PCMD8)", NULL, 0xb8, 0, 8, false, true, 0x151, false, 1U<<DIV_SAMPLE_DEPTH_YMZ_ADPCM,
     "used in some arcade boards. Can play back either 4-bit ADPCM, 8-bit PCM or 16-bit PCM.",
     {"PCM 1", "PCM 2", "PCM 3", "PCM 4", "PCM 5", "PCM 6", "PCM 7", "PCM 8"},
     {"1", "2", "3", "4", "5", "6", "7", "8"},
@@ -1588,7 +1593,7 @@ void DivEngine::registerSystems() {
   };
 
   sysDefs[DIV_SYSTEM_NAMCO]=new DivSysDef(
-    "Namco WSG", NULL, 0xb9, 0, 3, false, true, 0, false,
+    "Namco WSG", NULL, 0xb9, 0, 3, false, true, 0, false, 0,
     "a wavetable sound chip used in Pac-Man, among other early Namco arcade games.",
     {"Channel 1", "Channel 2", "Channel 3"},
     {"CH1", "CH2", "CH3"},
@@ -1599,7 +1604,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_NAMCO_15XX]=new DivSysDef(
-    "Namco C15 WSG", NULL, 0xba, 0, 8, false, true, 0, false,
+    "Namco C15 WSG", NULL, 0xba, 0, 8, false, true, 0, false, 0,
     "successor of the original Namco WSG chip, used in later Namco arcade games.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -1610,7 +1615,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_NAMCO_CUS30]=new DivSysDef(
-    "Namco C30 WSG", NULL, 0xbb, 0, 8, false, true, 0, false,
+    "Namco C30 WSG", NULL, 0xbb, 0, 8, false, true, 0, false, 0,
     "like Namco C15 but with stereo sound.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -1622,7 +1627,7 @@ void DivEngine::registerSystems() {
 
   // replace with an 8-channel chip in a future
   sysDefs[DIV_SYSTEM_RESERVED_8]=new DivSysDef(
-    "Reserved", NULL, 0xbc, 0, 8, false, true, 0, false,
+    "Reserved", NULL, 0xbc, 0, 8, false, true, 0, false, 0,
     "this was YM2612_FRAC, but due to changes this ID is reserved.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
@@ -1631,7 +1636,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2612_FRAC]=new DivSysDef(
-    "Yamaha YM2612 (OPN2) with DualPCM", NULL, 0xbe, 0, 7, true, false, 0, false,
+    "Yamaha YM2612 (OPN2) with DualPCM", NULL, 0xbe, 0, 7, true, false, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this chip is mostly known for being in the Sega Genesis (but it also was on the FM Towns computer).\nthis system uses software mixing to provide two sample channels.",
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6/PCM 1", "PCM 2"},
     {"F1", "F2", "F3", "F4", "F5", "P1", "P2"},
@@ -1643,7 +1648,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2612_FRAC_EXT]=new DivSysDef(
-    "Yamaha YM2612 (OPN2) Extended Channel 3 with DualPCM and CSM", NULL, 0xbd, 0, 11, true, false, 0, false,
+    "Yamaha YM2612 (OPN2) Extended Channel 3 with DualPCM and CSM", NULL, 0xbd, 0, 11, true, false, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT,
     "this chip is mostly known for being in the Sega Genesis (but it also was on the FM Towns computer).\nthis system uses software mixing to provide two sample channels.\nthis one is in Extended Channel mode, which turns the third FM channel into four operators with independent notes/frequencies.",
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6/PCM 1", "PCM 2", "CSM Timer"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "P1", "P2", "CSM"},
@@ -1655,7 +1660,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_T6W28]=new DivSysDef(
-    "T6W28", NULL, 0xbf, 0, 4, false, true, 0, false,
+    "T6W28", NULL, 0xbf, 0, 4, false, true, 0, false, 0,
     "an SN76489 derivative used in Neo Geo Pocket, has independent stereo volume and noise channel frequency.",
     {"Square 1", "Square 2", "Square 3", "Noise"},
     {"S1", "S2", "S3", "NO"},
@@ -1668,7 +1673,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_PCM_DAC]=new DivSysDef(
-    "Generic PCM DAC", NULL, 0xc0, 0, 1, false, true, 0, false,
+    "Generic PCM DAC", NULL, 0xc0, 0, 1, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_16BIT,
     "as generic sample playback as it gets.",
     {"Sample"},
     {"PCM"},
@@ -1677,7 +1682,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_DUMMY]=new DivSysDef(
-    "Dummy System", NULL, 0xfd, 0, 8, false, true, 0, false,
+    "Dummy System", NULL, 0xfd, 0, 8, false, true, 0, false, 0,
     "this is a system designed for testing purposes.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8"},
     {"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "CH8"},
diff --git a/src/gui/debug.cpp b/src/gui/debug.cpp
index d082f30c..482b4297 100644
--- a/src/gui/debug.cpp
+++ b/src/gui/debug.cpp
@@ -846,10 +846,16 @@ void putDispatchChan(void* data, int chanNum, int type) {
       ImGui::Text("- note: %d",ch->note);
       ImGui::Text("- ins: %d",ch->ins);
       ImGui::Text("* psgMode:");
-      ImGui::Text(" - tone: %d",ch->psgMode.tone);
-      ImGui::Text(" - noise: %d",ch->psgMode.noise);
-      ImGui::Text(" - envelope: %d",ch->psgMode.envelope);
-      ImGui::Text(" - dac: %d",ch->psgMode.dac);
+      ImGui::Text(" * curr:");
+      ImGui::Text("  - tone: %d",ch->currPSGMode.tone);
+      ImGui::Text("  - noise: %d",ch->currPSGMode.noise);
+      ImGui::Text("  - envelope: %d",ch->currPSGMode.envelope);
+      ImGui::Text("  - dac: %d",ch->currPSGMode.dac);
+      ImGui::Text(" * next:");
+      ImGui::Text("  - tone: %d",ch->nextPSGMode.tone);
+      ImGui::Text("  - noise: %d",ch->nextPSGMode.noise);
+      ImGui::Text("  - envelope: %d",ch->nextPSGMode.envelope);
+      ImGui::Text("  - dac: %d",ch->nextPSGMode.dac);
       ImGui::Text("* DAC:");
       ImGui::Text(" - sample: %d",ch->dac.sample);
       ImGui::Text(" - rate: %d",ch->dac.rate);
@@ -886,10 +892,16 @@ void putDispatchChan(void* data, int chanNum, int type) {
       ImGui::Text(" * slide: %d",ch->envelope.slide);
       ImGui::Text("  - low: %d",ch->envelope.slideLow);
       ImGui::Text("* psgMode:");
-      ImGui::Text(" - tone: %d",ch->psgMode.tone);
-      ImGui::Text(" - noise: %d",ch->psgMode.noise);
-      ImGui::Text(" - envelope: %d",ch->psgMode.envelope);
-      ImGui::Text(" - dac: %d",ch->psgMode.dac);
+      ImGui::Text(" * curr:");
+      ImGui::Text("  - tone: %d",ch->currPSGMode.tone);
+      ImGui::Text("  - noise: %d",ch->currPSGMode.noise);
+      ImGui::Text("  - envelope: %d",ch->currPSGMode.envelope);
+      ImGui::Text("  - dac: %d",ch->currPSGMode.dac);
+      ImGui::Text(" * next:");
+      ImGui::Text("  - tone: %d",ch->nextPSGMode.tone);
+      ImGui::Text("  - noise: %d",ch->nextPSGMode.noise);
+      ImGui::Text("  - envelope: %d",ch->nextPSGMode.envelope);
+      ImGui::Text("  - dac: %d",ch->nextPSGMode.dac);
       ImGui::Text("* DAC:");
       ImGui::Text(" - sample: %d",ch->dac.sample);
       ImGui::Text(" - rate: %d",ch->dac.rate);
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index a3e65e7c..d1909626 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -77,6 +77,9 @@ void FurnaceGUI::drawSampleEdit() {
               if (sampleDepths[i]==NULL) continue;
               if (ImGui::Selectable(sampleDepths[i])) {
                 sample->prepareUndo(true);
+                e->lockEngine([sample]() {
+                  sample->render();
+                });
                 sample->depth=(DivSampleDepth)i;
                 e->renderSamplesP();
                 updateSampleTex=true;
@@ -633,6 +636,9 @@ void FurnaceGUI::drawSampleEdit() {
               if (sampleDepths[i]==NULL) continue;
               if (ImGui::Selectable(sampleDepths[i])) {
                 sample->prepareUndo(true);
+                e->lockEngine([sample]() {
+                  sample->render();
+                });
                 sample->depth=(DivSampleDepth)i;
                 e->renderSamplesP();
                 updateSampleTex=true;