Merge branch 'tildearrow:master' into SID3

src/engine/platform/sms.cpp

@@ -165,8 +165,12 @@ int DivPlatformSMS::snCalcFreq(int ch) {
   if (ch==3) CHIP_DIVIDER=noiseDivider;
   int easyStartingPeriod=16;
   int easyThreshold=round(128.0*12.0*log((chipClock/(easyStartingPeriod*CHIP_DIVIDER))/(0.0625*parent->song.tuning))/log(2.0))-384+64;
-  if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(easyThreshold)) {
-    int ret=(((easyStartingPeriod<<7))-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold)))>>7;
+  int curFreq=chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2+(chan[ch].arpOff<<7);
+  if (chan[ch].fixedArp) {
+    curFreq=chan[ch].baseNoteOverride<<7;
+  }
+  if (parent->song.linearPitch==2 && easyNoise && curFreq>easyThreshold) {
+    int ret=(((easyStartingPeriod<<7))-(curFreq-(easyThreshold)))>>7;
     if (ret<0) ret=0;
     return ret;
   }

src/engine/platform/snes.cpp

@@ -840,6 +840,8 @@ void DivPlatformSNES::reset() {
   memcpy(sampleMem,copyOfSampleMem,65536);
   dsp.init(sampleMem);
   dsp.set_output(NULL,0);
+  dsp.setupInterpolation(!interpolationOff);
+
   memset(regPool,0,128);
   // this can't be 0 or channel 1 won't play
   // this can't be 0x100 either as that's used by SPC700 page 1 and the stack
@@ -1022,6 +1024,8 @@ void DivPlatformSNES::setFlags(const DivConfig& flags) {
   initEchoFIR[7]=flags.getInt("echoFilter7",0);
 
   initEchoMask=flags.getInt("echoMask",0);
+
+  interpolationOff=flags.getBool("interpolationOff",false);
 }
 
 int DivPlatformSNES::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {

src/engine/platform/snes.h

@@ -69,6 +69,7 @@ class DivPlatformSNES: public DivDispatch {
   bool writeEcho;
   bool writeDryVol;
   bool echoOn;
+  bool interpolationOff;
 
   bool initEchoOn;
   signed char initEchoVolL;

src/engine/platform/sound/snes/SPC_DSP.cpp

@@ -135,24 +135,39 @@ static short const gauss [512] =
 1299,1300,1300,1301,1302,1302,1303,1303,1303,1304,1304,1304,1304,1304,1305,1305,
 };
 
+void SPC_DSP::setupInterpolation(bool interpolate)
+{
+	for(int i = 0; i < voice_count; i++)
+	{
+		m.voices[i].interpolate = interpolate;
+	}
+}
+
 inline int SPC_DSP::interpolate( voice_t const* v )
 {
 	// Make pointers into gaussian based on fractional position between samples
-	int offset = v->interp_pos >> 4 & 0xFF;
-	short const* fwd = gauss + 255 - offset;
-	short const* rev = gauss       + offset; // mirror left half of gaussian
+	if(v->interpolate)
+	{
+		int offset = v->interp_pos >> 4 & 0xFF;
+		short const* fwd = gauss + 255 - offset;
+		short const* rev = gauss       + offset; // mirror left half of gaussian
 
-	int const* in = &v->buf [(v->interp_pos >> 12) + v->buf_pos];
-	int out;
-	out  = (fwd [  0] * in [0]) >> 11;
-	out += (fwd [256] * in [1]) >> 11;
-	out += (rev [256] * in [2]) >> 11;
-	out = (int16_t) out;
-	out += (rev [  0] * in [3]) >> 11;
+		int const* in = &v->buf [(v->interp_pos >> 12) + v->buf_pos];
+		int out;
+		out  = (fwd [  0] * in [0]) >> 11;
+		out += (fwd [256] * in [1]) >> 11;
+		out += (rev [256] * in [2]) >> 11;
+		out = (int16_t) out;
+		out += (rev [  0] * in [3]) >> 11;
 
-	CLAMP16( out );
-	out &= ~1;
-	return out;
+		CLAMP16( out );
+		out &= ~1;
+		return out;
+	}
+	else
+	{
+		return v->buf [(v->interp_pos >> 12) + v->buf_pos]; //Furnace addition -- no interpolation
+	}
 }
 
 

src/engine/platform/sound/snes/SPC_DSP.h

@@ -27,6 +27,9 @@ public:
 	// output buffer could hold.
 	int sample_count() const;
 
+	// Furnace addition: disable/enable Gaussian interpolation
+	void setupInterpolation(bool interpolate);
+
 // Emulation
 
 	// Resets DSP to power-on state
@@ -122,6 +125,7 @@ public:
 		int hidden_env;         // used by GAIN mode 7, very obscure quirk
 		uint8_t t_envx_out;
 		sample_t out[2];        // Furnace addition, for per-channel oscilloscope
+		bool interpolate;       // Furnace addition, to disable interpolation
 	};
 
   // Furnace addition, gets a voice