Fix "possible loss of data" warnings with MSVC

mixxxdj · Dec 7, 2023 · fea0b75 · fea0b75
1 parent 42893f2
commit fea0b75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/lib/reverb/Reverb.h b/lib/reverb/Reverb.h
@@ -61,7 +61,7 @@ class Lattice
 : public DSP::Delay
 {
 	public:
-		sample_t process (sample_t x, double d)
+		sample_t process (sample_t x, sample_t d)
 			{
 				sample_t y = get();
 				x -= d*y;
@@ -126,8 +126,8 @@ class ModLattice
 
 		void init (int n, int w)
 			{
-				n0 = n;
-				width = w;
+				n0 = static_cast<float>(n);
+				width = static_cast<float>(w);
 				delay.init (n + w);
 			}
 
@@ -137,9 +137,9 @@ class ModLattice
 			}
 
 		inline sample_t
-		process (sample_t x, double d)
+		process (sample_t x, sample_t d)
 			{
-				sample_t y = delay.get_linear (n0 + width * lfo.get());
+				sample_t y = delay.get_linear (n0 + width * static_cast<float>(lfo.get()));
 				x += d * y;
 				delay.put (x);
 				return y - d * x; /* note sign */

diff --git a/lib/reverb/dsp/Delay.h b/lib/reverb/dsp/Delay.h
@@ -104,12 +104,9 @@ class Delay
 				sample_t x2 = (*this) [n + 2];
 
 				/* sample_t (32bit) quicker than double here */
-				sample_t a =
-						(3 * (x0 - x1) - x_1 + x2) * .5;
-				sample_t b =
-						2 * x1 + x_1 - (5 * x0 + x2) * .5;
-				sample_t c =
-						(x1 - x_1) * .5;
+				sample_t a = (3 * (x0 - x1) - x_1 + x2) * .5f;
+				sample_t b = 2 * x1 + x_1 - (5 * x0 + x2) * .5f;
+				sample_t c = (x1 - x_1) * .5f;
 
 				return x0 + (((a * f) + b) * f + c) * f;
 			}
@@ -124,7 +121,7 @@ class MovingAverage
 		void init (uint n)
 			{
 				this->Delay::init (n);
-				over_n = 1. / n;
+				over_n = 1.f / n;
 				/* adjust write pointer so we have a full history of zeros */
 				write = (write + size + 1) & size;
 				state = 0;

diff --git a/lib/reverb/dsp/IIR1.h b/lib/reverb/dsp/IIR1.h
@@ -36,7 +36,7 @@ class LP1
 	public:
 		T a0, b1, y1;
 
-		LP1 (double d = 1.)
+		LP1 (T d = 1.)
 			{
 				set (d);
 				y1 = 0.;