Unify shared channel struct, De-duplicate channel debug

src/engine/platform/amiga.h

@@ -22,11 +22,10 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 
 class DivPlatformAmiga: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned int audLoc;
     unsigned short audLen;
     unsigned int audPos;
@@ -35,15 +34,9 @@ class DivPlatformAmiga: public DivDispatch {
     int sample, wave;
     int busClock;
     bool useWave, setPos, useV, useP;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(64),
+      SharedChannel<signed char>(64),
       audLoc(0),
       audLen(0),
       audPos(0),

src/engine/platform/ay.h

@@ -20,7 +20,6 @@
 #ifndef _AY_H
 #define _AY_H
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "sound/ay8910.h"
 
@@ -30,7 +29,7 @@ class DivPlatformAY8910: public DivDispatch {
       0,4,1,5,2,6,9,8,11,12,13,3,7,10,14,15
     };
     inline unsigned char regRemap(unsigned char reg) { return intellivision?AY8914RegRemap[reg&0x0f]:reg&0x0f; }
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       struct PSGMode {
         union {
           struct {
@@ -75,14 +74,8 @@ class DivPlatformAY8910: public DivDispatch {
 
       unsigned char autoEnvNum, autoEnvDen;
       signed char konCycles;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(15),
+        SharedChannel<int>(15),
         curPSGMode(PSGMode(0)),
         nextPSGMode(PSGMode(1)),
         dac(DAC()),

src/engine/platform/ay8930.h

@@ -20,13 +20,12 @@
 #ifndef _AY8930_H
 #define _AY8930_H
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "sound/ay8910.h"
 
 class DivPlatformAY8930: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       struct Envelope {
         unsigned char mode;
         unsigned short period;
@@ -83,14 +82,8 @@ class DivPlatformAY8930: public DivDispatch {
 
       unsigned char autoEnvNum, autoEnvDen, duty;
       signed char konCycles;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(31),
+        SharedChannel<int>(31),
         envelope(Envelope()),
         curPSGMode(PSGMode(0)),
         nextPSGMode(PSGMode(1)),

src/engine/platform/bubsyswsg.h

@@ -22,23 +22,16 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "vgsound_emu/src/k005289/k005289.hpp"
 
 class DivPlatformBubSysWSG: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     signed short wave;
     signed char waveROM[32] = {0}; // 4 bit PROM per channel on bubble system
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       wave(-1) {}
   };
   Channel chan[2];

src/engine/platform/c64.h

@@ -22,25 +22,18 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/c64/sid.h"
 #include "sound/c64_fp/SID.h"
 
 class DivPlatformC64: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int prevFreq, testWhen;
     unsigned char sweep, wave, attack, decay, sustain, release;
     short duty;
     bool sweepChanged, filter;
     bool resetMask, resetFilter, resetDuty, ring, sync, test;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       prevFreq(65535),
       testWhen(0),
       sweep(0),

src/engine/platform/fds.h

@@ -21,26 +21,18 @@
 #define _FDS_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "../waveSynth.h"
-
 #include "sound/nes_nsfplay/nes_fds.h"
 
 class DivPlatformFDS: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int prevFreq, modFreq;
     unsigned char duty, sweep, modDepth, modPos;
     bool sweepChanged, modOn;
     signed short wave;
     signed char modTable[32];
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(32),
+      SharedChannel<signed char>(32),
       prevFreq(65535),
       modFreq(0),
       duty(0),

src/engine/platform/fmshared_OPN.h

@@ -123,19 +123,13 @@ class DivPlatformOPN: public DivPlatformFMBase {
         pan(3) {}
     };
 
-    struct OPNOpChannel: public SharedChannelFreq, public SharedChannelVolume<int> {
-      DivMacroInt std;
+    struct OPNOpChannel: public SharedChannel<int> {
       unsigned char freqH, freqL;
       int portaPauseFreq;
       signed char konCycles;
       bool mask;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       OPNOpChannel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(0),
+        SharedChannel<int>(0),
         freqH(0),
         freqL(0),
         portaPauseFreq(0),

src/engine/platform/fmsharedbase.h

@@ -22,7 +22,6 @@
 
 #include "../dispatch.h"
 #include "../instrument.h"
-#include "../macroInt.h"
 #include <deque>
 
 #define KVS(x,y) ((chan[x].state.op[y].kvs==2 && isOutput[chan[x].state.alg][y]) || chan[x].state.op[y].kvs==1)
@@ -48,22 +47,16 @@ class DivPlatformFMBase: public DivDispatch {
       0,2,1,3
     };
 
-    struct FMChannel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct FMChannel: public SharedChannel<int> {
       DivInstrumentFM state;
-      DivMacroInt std;
       unsigned char freqH, freqL;
       int portaPauseFreq;
       unsigned char opMask;
       signed char konCycles;
       bool hardReset, opMaskChanged;
 
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       FMChannel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(0),
+        SharedChannel<int>(0),
         freqH(0),
         freqL(0),
         portaPauseFreq(0),
@@ -125,8 +118,7 @@ class DivPlatformFMBase: public DivDispatch {
 
     friend void putDispatchChan(void*,int,int);
   
-    DivPlatformFMBase():
-    DivDispatch(),
+    DivPlatformFMBase():DivDispatch(),
     lastBusy(0),
     delay(0) {}
 };

src/engine/platform/gb.h

@@ -21,13 +21,12 @@
 #define _GB_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "sound/gb/gb.h"
 #include <queue>
 
 class DivPlatformGB: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned char duty, sweep;
     bool sweepChanged, released, softEnv, killIt;
     bool soManyHacksToMakeItDefleCompatible;
@@ -36,14 +35,8 @@ class DivPlatformGB: public DivDispatch {
     unsigned char envVol, envDir, envLen, soundLen;
     unsigned short hwSeqPos;
     short hwSeqDelay;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       duty(0),
       sweep(0),
       sweepChanged(false),

src/engine/platform/genesis.h

@@ -20,7 +20,7 @@
 #ifndef _GENESIS_H
 #define _GENESIS_H
 #include "fmshared_OPN.h"
-#include "../macroInt.h"
+
 #include "../../../extern/Nuked-OPN2/ym3438.h"
 #include "sound/ymfm/ymfm_opn.h"
 

src/engine/platform/lynx.h

@@ -21,7 +21,6 @@
 #define _LYNX_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "sound/lynx/Mikey.hpp"
 
 class DivPlatformLynx: public DivDispatch {
@@ -40,22 +39,15 @@ class DivPlatformLynx: public DivDispatch {
     MikeyDuty(int duty);
   };
 
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
-    DivMacroInt std;
+  struct Channel: public SharedChannel<signed char> {
     MikeyFreqDiv fd;
     MikeyDuty duty;
     int actualNote, lfsr, sample, samplePos, sampleAccum, sampleBaseFreq, sampleFreq;
     unsigned char pan;
     bool pcm;
     int macroVolMul;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(127),
-      std(),
+      SharedChannel<signed char>(127),
       fd(0),
       duty(0),
       actualNote(0),

src/engine/platform/mmc5.h

@@ -21,22 +21,15 @@
 #define _MMC5_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 
 class DivPlatformMMC5: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int prevFreq;
     unsigned char duty, sweep;
     bool sweepChanged, furnaceDac;
-    signed char wave;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
+    signed short wave;
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       prevFreq(65535),
       duty(0),
       sweep(8),

src/engine/platform/msm5232.h

@@ -22,20 +22,13 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/oki/msm5232.h"
 
 class DivPlatformMSM5232: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     bool noise;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(127),
+      SharedChannel<signed char>(127),
       noise(false) {}
   };
   Channel chan[8];

src/engine/platform/msm6258.h

@@ -19,24 +19,19 @@
 
 #ifndef _MSM6258_H
 #define _MSM6258_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "sound/oki/okim6258.h"
 
 class DivPlatformMSM6258: public DivDispatch {
   protected:
-    struct Channel: public SharedChannel, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       bool furnacePCM;
       int sample;
       unsigned char pan;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-      }
       Channel():
-        SharedChannel(),
-        SharedChannelVolume<int>(8),
+        SharedChannel<int>(8),
         furnacePCM(false),
         sample(-1),
         pan(3) {}

src/engine/platform/msm6295.h

@@ -19,23 +19,18 @@
 
 #ifndef _MSM6295_H
 #define _MSM6295_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "vgsound_emu/src/msm6295/msm6295.hpp"
 
 class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
   protected:
-    struct Channel: public SharedChannel, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       bool furnacePCM;
       int sample;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-      }
       Channel():
-        SharedChannel(),
-        SharedChannelVolume<int>(8),
+        SharedChannel<int>(8),
         furnacePCM(false),
         sample(-1) {}
     };
@@ -96,8 +91,7 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
 
     virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
     virtual void quit() override;
-    DivPlatformMSM6295():
-      DivDispatch(),
+    DivPlatformMSM6295():DivDispatch(),
       vgsound_emu_mem_intf(),
       msm(*this) {}
     ~DivPlatformMSM6295();

src/engine/platform/n163.h

@@ -22,12 +22,11 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "vgsound_emu/src/n163/n163.hpp"
 
 class DivPlatformN163: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     signed char resVol;
     short wave, wavePos, waveLen;
     unsigned char waveMode;
@@ -35,15 +34,9 @@ class DivPlatformN163: public DivDispatch {
     unsigned char loadMode;
     bool volumeChanged;
     bool waveChanged, waveUpdated;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       resVol(15),
       wave(-1),
       wavePos(0),

src/engine/platform/namcowsg.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "sound/namco.h"
 
 class DivPlatformNamcoWSG: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned char pan;
     bool noise;
-    signed char wave;
-    DivMacroInt std;
+    signed short wave;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       pan(255),
       noise(false),
       wave(-1) {}

src/engine/platform/nes.h

@@ -21,24 +21,17 @@
 #define _NES_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 
 #include "sound/nes_nsfplay/nes_apu.h"
 
 class DivPlatformNES: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int prevFreq;
     unsigned char duty, sweep, envMode, len;
     bool sweepChanged, furnaceDac;
-    signed char wave;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
+    signed short wave;
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       prevFreq(65535),
       duty(0),
       sweep(8),

src/engine/platform/opl.h

@@ -19,8 +19,8 @@
 
 #ifndef _OPL_H
 #define _OPL_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "../../../extern/opl/opl3.h"
 #include "sound/ymfm/ymfm_adpcm.h"
@@ -36,21 +36,15 @@ class DivOPLAInterface: public ymfm::ymfm_interface {
 
 class DivPlatformOPL: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       DivInstrumentFM state;
-      DivMacroInt std;
       unsigned char freqH, freqL;
       int sample, fixedFreq;
       bool furnacePCM, fourOp, hardReset;
       unsigned char pan;
       int macroVolMul;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(0),
+        SharedChannel<int>(0),
         freqH(0),
         freqL(0),
         sample(-1),

src/engine/platform/opll.h

@@ -19,8 +19,8 @@
 
 #ifndef _OPLL_H
 #define _OPLL_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 
 extern "C" {
@@ -29,20 +29,14 @@ extern "C" {
 
 class DivPlatformOPLL: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       DivInstrumentFM state;
-      DivMacroInt std;
       unsigned char freqH, freqL;
       int fixedFreq;
       bool furnaceDac;
       unsigned char pan;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(0),
+        SharedChannel<int>(0),
         freqH(0),
         freqL(0),
         fixedFreq(0),

src/engine/platform/pce.h

@@ -22,12 +22,11 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "sound/pce_psg.h"
 
 class DivPlatformPCE: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int antiClickPeriodCount, antiClickWavePos;
     int dacPeriod, dacRate, dacOut;
     unsigned int dacPos;
@@ -36,15 +35,9 @@ class DivPlatformPCE: public DivDispatch {
     bool noise, pcm, furnaceDac, deferredWaveUpdate;
     signed short wave;
     int macroVolMul;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(31),
+      SharedChannel<signed char>(31),
       antiClickPeriodCount(0),
       antiClickWavePos(0),
       dacPeriod(0),

src/engine/platform/pcmdac.h

@@ -22,11 +22,10 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 
 class DivPlatformPCMDAC: public DivDispatch {
-  struct Channel: public SharedChannelFreq {
+  struct Channel: public SharedChannel<int> {
     bool audDir;
     unsigned int audLoc;
     unsigned short audLen;
@@ -35,15 +34,10 @@ class DivPlatformPCMDAC: public DivDispatch {
     int sample, wave;
     int panL, panR;
     bool useWave, setPos;
-    int vol, envVol;
-    DivMacroInt std;
+    int envVol;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
+      SharedChannel<int>(255),
       audDir(false),
       audLoc(0),
       audLen(0),
@@ -55,7 +49,6 @@ class DivPlatformPCMDAC: public DivDispatch {
       panR(255),
       useWave(false),
       setPos(false),
-      vol(255),
       envVol(64) {}
   };
   Channel chan;

src/engine/platform/pcspkr.h

@@ -21,22 +21,15 @@
 #define _PCSPKR_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include <thread>
 #include <mutex>
 #include <condition_variable>
 
 class DivPlatformPCSpeaker: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
+  struct Channel: public SharedChannel<signed char> {
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15) {}
+      SharedChannel<signed char>(15) {}
   };
   Channel chan[1];
   DivDispatchOscBuffer* oscBuf;

src/engine/platform/pet.h

@@ -21,23 +21,16 @@
 #define _PET_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 
 class DivPlatformPET: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     bool enable;
     int wave;
     unsigned char sreg;
     int cnt;
     short out;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(1),
+      SharedChannel<int>(1),
       enable(false),
       wave(0b00001111),
       sreg(0),

src/engine/platform/pong.h

@@ -21,18 +21,11 @@
 #define _PONG_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 
 class DivPlatformPong: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
+  struct Channel: public SharedChannel<signed char> {
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(1) {}
+      SharedChannel<signed char>(1) {}
   };
   Channel chan[1];
   DivDispatchOscBuffer* oscBuf;

src/engine/platform/qsound.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/qsound.h"
 
 class DivPlatformQSound: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     int resVol;
     int sample, wave;
     int panning;
     int echo;
     bool useWave, surround, isNewQSound;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(255),
+      SharedChannel<int>(255),
       resVol(4095),
       sample(-1),
       panning(0x10),

src/engine/platform/rf5c68.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/rf5c68.h"
 
 class DivPlatformRF5C68: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     unsigned int audPos;
     int sample, wave;
     int panning;
     bool setPos;
     int macroVolMul;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(255),
+      SharedChannel<int>(255),
       audPos(0),
       sample(-1),
       panning(255),

src/engine/platform/saa.h

@@ -19,25 +19,19 @@
 
 #ifndef _SAA_H
 #define _SAA_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "../../../extern/SAASound/src/SAASound.h"
 
 class DivPlatformSAA1099: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       unsigned char freqH, freqL;
       unsigned char psgMode;
       unsigned char pan;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(15),
+        SharedChannel<int>(15),
         freqH(0),
         freqL(0),
         psgMode(1),

src/engine/platform/scc.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "vgsound_emu/src/scc/scc.hpp"
 
 class DivPlatformSCC: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     bool freqInit;
     signed short wave;
     signed char waveROM[32] = {0}; // 8 bit signed waveform
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       freqInit(false),
       wave(-1) {}
   };

src/engine/platform/segapcm.h

@@ -19,15 +19,14 @@
 
 #ifndef _SEGAPCM_H
 #define _SEGAPCM_H
+
 #include "../dispatch.h"
 #include "../instrument.h"
 #include <queue>
-#include "../macroInt.h"
 
 class DivPlatformSegaPCM: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
-      DivMacroInt std;
+    struct Channel: public SharedChannel<int> {
       bool furnacePCM, isNewSegaPCM;
       unsigned char chVolL, chVolR;
       unsigned char chPanL, chPanR;
@@ -40,13 +39,8 @@ class DivPlatformSegaPCM: public DivDispatch {
         unsigned char freq;
         PCMChannel(): sample(-1), pos(0), len(0), freq(0) {}
       } pcm;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(127),
+        SharedChannel<int>(127),
         furnacePCM(false),
         isNewSegaPCM(false),
         chVolL(127),

src/engine/platform/sms.h

@@ -21,7 +21,6 @@
 #define _SMS_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "sound/sn76496.h"
 extern "C" {
   #include "../../../extern/Nuked-PSG/ympsg.h"
@@ -29,17 +28,11 @@ extern "C" {
 #include <queue>
 
 class DivPlatformSMS: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int actualNote;
     bool writeVol;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       actualNote(0),
       writeVol(false) {}
   };

src/engine/platform/snes.h

@@ -21,28 +21,21 @@
 #define _SNES_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include <queue>
 #include "sound/snes/SPC_DSP.h"
 
 class DivPlatformSNES: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     unsigned int audPos;
     int sample, wave;
     int panL, panR;
     bool useWave, setPos, noise, echo, pitchMod, invertL, invertR, shallWriteVol, shallWriteEnv;
     int wtLen;
     DivInstrumentSNES state;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(127),
+      SharedChannel<int>(127),
       audPos(0),
       sample(-1),
       wave(-1),

src/engine/platform/su.h

@@ -22,11 +22,10 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/su.h"
 
 class DivPlatformSoundUnit: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int cutoff, baseCutoff, res, control, hasOffset;
     signed char pan;
     unsigned char duty;
@@ -37,14 +36,8 @@ class DivPlatformSoundUnit: public DivDispatch {
     unsigned char freqSweepV, volSweepV, cutSweepV;
     unsigned short syncTimer;
     signed short wave;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(127),
+      SharedChannel<signed char>(127),
       cutoff(16383),
       baseCutoff(16380),
       res(0),

src/engine/platform/swan.h

@@ -21,24 +21,17 @@
 #define _SWAN_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "sound/swan.h"
 #include <queue>
 
 class DivPlatformSwan: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     unsigned char pan;
     int wave;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(15),
+      SharedChannel<int>(15),
       pan(255),
       wave(-1) {}
   };

src/engine/platform/t6w28.h

@@ -22,20 +22,13 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/t6w28/T6W28_Apu.h"
 
 class DivPlatformT6W28: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned char panL, panR, duty;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       panL(15),
       panR(15),
       duty(7) {}

src/engine/platform/tia.h

@@ -19,23 +19,17 @@
 
 #ifndef _TIA_H
 #define _TIA_H
+
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include <queue>
 #include "sound/tia/Audio.h"
 
 class DivPlatformTIA: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       unsigned char shape;
-      DivMacroInt std;
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(15),
+        SharedChannel<int>(15),
         shape(4) {}
     };
     Channel chan[2];

src/engine/platform/tx81z.h

@@ -19,6 +19,7 @@
 
 #ifndef _TX81Z_H
 #define _TX81Z_H
+
 #include "fmshared_OPM.h"
 #include <queue>
 #include "sound/ymfm/ymfm_opz.h"

src/engine/platform/vb.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "sound/vsu.h"
 
 class DivPlatformVB: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned char pan, envLow, envHigh;
     bool noise, deferredWaveUpdate;
     signed short wave;
-    DivMacroInt std;
     DivWaveSynth ws;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       pan(255),
       envLow(0),
       envHigh(0),

src/engine/platform/vera.h

@@ -19,20 +19,19 @@
 
 #ifndef _VERA_H
 #define _VERA_H
+
 #include "../dispatch.h"
 #include "../instrument.h"
-#include "../macroInt.h"
 
 struct VERA_PSG;
 struct VERA_PCM;
 
 class DivPlatformVERA: public DivDispatch {
   protected:
-    struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    struct Channel: public SharedChannel<int> {
       unsigned char pan;
       unsigned accum;
       int noiseval;
-      DivMacroInt std;
 
       struct PCMChannel {
         int sample;
@@ -42,14 +41,8 @@ class DivPlatformVERA: public DivDispatch {
         bool depth16;
         PCMChannel(): sample(-1), pos(0), len(0), freq(0), depth16(false) {}
       } pcm;
-      // somebody please split this into multiple lines!
-      void macroInit(DivInstrument* which) {
-        std.init(which);
-        pitch2=0;
-      }
       Channel():
-        SharedChannelFreq(),
-        SharedChannelVolume<int>(0),
+        SharedChannel<int>(0),
         pan(0),
         accum(0),
         noiseval(0),

src/engine/platform/vic20.h

@@ -21,21 +21,14 @@
 #define _VIC20_H
 
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "sound/vic20sound.h"
 #include <queue>
 
 class DivPlatformVIC20: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     int wave, waveWriteCycle;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(15),
+      SharedChannel<int>(15),
       wave(0),
       waveWriteCycle(-1) {}
   };

src/engine/platform/vrc6.h

@@ -22,25 +22,18 @@
 
 #include <queue>
 #include "../dispatch.h"
-#include "../macroInt.h"
 #include "vgsound_emu/src/vrcvi/vrcvi.hpp"
 
 
 class DivPlatformVRC6: public DivDispatch, public vrcvi_intf {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     int dacPeriod, dacRate, dacOut;
     unsigned int dacPos;
     int dacSample;
     unsigned char duty;
     bool pcm, furnaceDac;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(15),
+      SharedChannel<signed char>(15),
       dacPeriod(0),
       dacRate(0),
       dacOut(0),

src/engine/platform/x1_010.h

@@ -22,12 +22,11 @@
 
 #include "../dispatch.h"
 #include "../engine.h"
-#include "../macroInt.h"
 #include "../waveSynth.h"
 #include "vgsound_emu/src/x1_010/x1_010.hpp"
 
 class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     struct Envelope {
       struct EnvFlag {
         unsigned char envEnable : 1;
@@ -77,7 +76,6 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
     unsigned char waveBank;
     unsigned int bankSlot;
     Envelope env;
-    DivMacroInt std;
     DivWaveSynth ws;
     void reset() {
         freq=baseFreq=pitch=pitch2=note=0;
@@ -90,13 +88,8 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
         vol=outVol=lvol=rvol=15;
         waveBank=0;
     }
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(15),
+      SharedChannel<int>(15),
       fixedFreq(0),
       wave(-1),
       sample(-1),

src/engine/platform/ym2203.h

@@ -19,6 +19,7 @@
 
 #ifndef _YM2203_H
 #define _YM2203_H
+
 #include "fmshared_OPN.h"
 #include "sound/ymfm/ymfm_opn.h"
 

src/engine/platform/ym2203ext.h

@@ -17,6 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _YM2203EXT_H
+#define _YM2203EXT_H
+
 #include "../dispatch.h"
 
 #include "ym2203.h"
@@ -40,3 +43,5 @@ class DivPlatformYM2203Ext: public DivPlatformYM2203 {
     void quit();
     ~DivPlatformYM2203Ext();
 };
+
+#endif

src/engine/platform/ym2608.h

@@ -19,6 +19,7 @@
 
 #ifndef _YM2608_H
 #define _YM2608_H
+
 #include "fmshared_OPN.h"
 #include "sound/ymfm/ymfm_opn.h"
 

src/engine/platform/ym2608ext.h

@@ -17,6 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _YM2608EXT_H
+#define _YM2608EXT_H
+
 #include "../dispatch.h"
 
 #include "ym2608.h"
@@ -40,3 +43,5 @@ class DivPlatformYM2608Ext: public DivPlatformYM2608 {
     void quit();
     ~DivPlatformYM2608Ext();
 };
+
+#endif

src/engine/platform/ym2610.h

@@ -19,6 +19,7 @@
 
 #ifndef _YM2610_H
 #define _YM2610_H
+
 #include "ym2610shared.h"
 
 class DivPlatformYM2610: public DivPlatformYM2610Base<14> {

src/engine/platform/ym2610b.h

@@ -19,6 +19,7 @@
 
 #ifndef _YM2610B_H
 #define _YM2610B_H
+
 #include "ym2610shared.h"
 
 class DivPlatformYM2610B: public DivPlatformYM2610Base<16> {

src/engine/platform/ym2610bext.h

@@ -17,6 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _YM2610BEXT_H
+#define _YM2610BEXT_H
+
 #include "../dispatch.h"
 
 #include "ym2610b.h"
@@ -40,3 +43,5 @@ class DivPlatformYM2610BExt: public DivPlatformYM2610B {
     void quit();
     ~DivPlatformYM2610BExt();
 };
+
+#endif

src/engine/platform/ym2610ext.h

@@ -17,6 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef _YM2610EXT_H
+#define _YM2610EXT_H
+
 #include "../dispatch.h"
 
 #include "ym2610.h"
@@ -40,3 +43,5 @@ class DivPlatformYM2610Ext: public DivPlatformYM2610 {
     void quit();
     ~DivPlatformYM2610Ext();
 };
+
+#endif

src/engine/platform/ym2610shared.h

@@ -19,6 +19,7 @@
 
 #ifndef _YM2610SHARED_H
 #define _YM2610SHARED_H
+
 #include "fmshared_OPN.h"
 #include "../engine.h"
 #include "../../ta-log.h"

src/engine/platform/ymz280b.h

@@ -22,24 +22,17 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 #include "sound/ymz280b.h"
 
 class DivPlatformYMZ280B: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     unsigned int audPos;
     int sample, wave;
     int panning;
     bool setPos, isNewYMZ;
     int macroVolMul;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(255),
+      SharedChannel<int>(255),
       audPos(0),
       sample(-1),
       panning(8),

src/engine/platform/zxbeeper.h

@@ -22,20 +22,13 @@
 
 #include "../dispatch.h"
 #include <queue>
-#include "../macroInt.h"
 
 class DivPlatformZXBeeper: public DivDispatch {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<signed char> {
+  struct Channel: public SharedChannel<signed char> {
     unsigned short sPosition;
     unsigned char duty;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<signed char>(1),
+      SharedChannel<signed char>(1),
       sPosition(0),
       duty(64) {}
   };