Merge a538a7dc89 into b8804a0d2e

src/effect_mixer.hpp

@@ -124,31 +124,10 @@ public:
 		assert(in);
 
 		// left
-		arm_scale_f32(in, panorama[channel][0], tmp, buffer_length);
+		arm_scale_f32(in, panorama[channel][0] * multiplier[channel], tmp, buffer_length);
-		if(multiplier[channel]!=UNITY_GAIN)
-			arm_scale_f32(tmp,multiplier[channel],tmp,buffer_length);
-		arm_add_f32(sumbufL, tmp, sumbufL, buffer_length);
-		// right
-		arm_scale_f32(in, panorama[channel][1], tmp, buffer_length);
-		if(multiplier[channel]!=UNITY_GAIN)
-			arm_scale_f32(tmp,multiplier[channel],tmp,buffer_length);
-		arm_add_f32(sumbufR, tmp, sumbufR, buffer_length);
-	}
-
-	void doAddMix(uint8_t channel, float32_t* inL, float32_t* inR)
-	{
-		float32_t tmp[buffer_length];
-
-		assert(inL);
-		assert(inR);
-
-		// left
-		if(multiplier[channel]!=UNITY_GAIN)
-			arm_scale_f32(inL,multiplier[channel],tmp,buffer_length);
 		arm_add_f32(sumbufL, tmp, sumbufL, buffer_length);
 		// right
-		if(multiplier[channel]!=UNITY_GAIN)
+		arm_scale_f32(in, panorama[channel][1] * multiplier[channel], tmp, buffer_length);
-			arm_scale_f32(inR,multiplier[channel],tmp,buffer_length);
 		arm_add_f32(sumbufR, tmp, sumbufR, buffer_length);
 	}
 
@@ -168,6 +147,20 @@ public:
 			arm_fill_f32(0.0f, sumbufR, buffer_length);
 	}
 
+	void getBuffers(float32_t (*buffers[2]))
+	{
+		buffers[0] = sumbufL;
+		buffers[1] = sumbufR;
+	}
+
+	void zeroFill()
+	{
+		if(sumbufL)
+			arm_fill_f32(0.0f, sumbufL, buffer_length);
+		if(sumbufR)
+			arm_fill_f32(0.0f, sumbufR, buffer_length);
+	}
+
 protected:
 	using AudioMixer<NN>::sumbufL;
 	using AudioMixer<NN>::multiplier;

src/minidexed.cpp

@@ -1406,34 +1406,35 @@ void CMiniDexed::ProcessSound (void)
 
 			if(nMasterVolume > 0.0)
 			{
+				// get the mix buffer of all TGs
+				float32_t (*SampleBuffer[2]);
+				tg_mixer->getBuffers(SampleBuffer);
+
+				tg_mixer->zeroFill();
+
 				for (uint8_t i = 0; i < m_nToneGenerators; i++)
 				{
 					tg_mixer->doAddMix(i,m_OutputLevel[i]);
-					reverb_send_mixer->doAddMix(i,m_OutputLevel[i]);
 				}
 				// END TG mixing
 
-				// BEGIN create SampleBuffer for holding audio data
-				float32_t SampleBuffer[2][nFrames];
-				// END create SampleBuffer for holding audio data
-
-				// get the mix of all TGs
-				tg_mixer->getMix(SampleBuffer[indexL], SampleBuffer[indexR]);
-
 				// BEGIN adding reverb
 				if (m_nParameter[ParameterReverbEnable])
 				{
 					float32_t ReverbBuffer[2][nFrames];
-					float32_t ReverbSendBuffer[2][nFrames];
 
-					arm_fill_f32(0.0f, ReverbBuffer[indexL], nFrames);
+					float32_t (*ReverbSendBuffer[2]);
-					arm_fill_f32(0.0f, ReverbBuffer[indexR], nFrames);
+					reverb_send_mixer->getBuffers(ReverbSendBuffer);
-					arm_fill_f32(0.0f, ReverbSendBuffer[indexR], nFrames);
+
-					arm_fill_f32(0.0f, ReverbSendBuffer[indexL], nFrames);
+					reverb_send_mixer->zeroFill();
+
+					for (uint8_t i = 0; i < m_nToneGenerators; i++)
+					{
+						reverb_send_mixer->doAddMix(i,m_OutputLevel[i]);
+					}
 
 					m_ReverbSpinLock.Acquire ();
 
-					reverb_send_mixer->getMix(ReverbSendBuffer[indexL], ReverbSendBuffer[indexR]);
 					reverb->doReverb(ReverbSendBuffer[indexL],ReverbSendBuffer[indexR],ReverbBuffer[indexL], ReverbBuffer[indexR],nFrames);
 
 					// scale down and add left reverb buffer by reverb level