More types and casting changes

Author: adamstark

tests/FileWritingTests.cpp

@@ -14,7 +14,7 @@ template <typename T>
 void writeTestAudioFile (int numChannels, int sampleRate, int bitDepth, AudioFileFormat format)
 {
     std::string sampleType;
-    float sampleRateAsFloat = (float) sampleRate;
+    float sampleRateAsFloat = static_cast<float> (sampleRate);
 
     AudioFile<T> audioFileWriter;
 
@@ -47,12 +47,12 @@ void writeTestAudioFile (int numChannels, int sampleRate, int bitDepth, AudioFil
         T sample;
 
         if constexpr (std::numeric_limits<T>::is_integer && std::is_unsigned_v<T>)
-            sample = (T)(((sinf (2. * M_PI * ((double) i / sampleRateAsFloat) * 440.) + 1.) / 2.) * maxValue);
+            sample = static_cast<T> (((sin (2. * M_PI * (static_cast<double> (i) / static_cast<double> (sampleRateAsFloat)) * 440.) + 1.) / 2.) * maxValue);
         else
-            sample = (T)(sinf (2. * M_PI * ((double) i / sampleRateAsFloat) * 440.) * maxValue);
+            sample = static_cast<T> (sin (2. * M_PI * (static_cast<double> (i) / static_cast<double> (sampleRateAsFloat)) * 440.) * static_cast<double> (maxValue));
 
         for (int k = 0; k < audioFileWriter.getNumChannels(); k++)
-            audioFileWriter.samples[k][i] = sample * 0.5f;
+            audioFileWriter.samples[k][i] = sample * static_cast<T> (0.5);
     }
 
     audioFileWriter.setSampleRate (sampleRate);

tests/SampleConversionTests.cpp

@@ -103,7 +103,7 @@ TEST_SUITE ("SampleConversionTests::8-bit Conversions - sampleToSignedByte()")
         REQUIRE_EQ (AudioSampleConverter<float>::sampleToSignedByte (-1.f), -127);
         REQUIRE_EQ (AudioSampleConverter<float>::sampleToSignedByte (std::numeric_limits<float>::lowest()), -127);
 
-        REQUIRE_EQ (AudioSampleConverter<double>::sampleToSignedByte (std::numeric_limits<float>::max()), 127);
+        REQUIRE_EQ (AudioSampleConverter<double>::sampleToSignedByte (std::numeric_limits<double>::max()), 127);
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToSignedByte (1.), 127);
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToSignedByte (0.5), 63);
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToSignedByte (0.), 0);
@@ -717,10 +717,10 @@ TEST_SUITE ("SampleConversionTests::32-bit Conversions")
         REQUIRE_EQ (AudioSampleConverter<float>::sampleToThirtyTwoBitInt (std::numeric_limits<float>::lowest()), -2147483647);
 
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (std::numeric_limits<double>::max()), 2147483647);
-        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (1.f), 2147483647);
-        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (0.5f), 1073741823);
-        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (0.f), 0);
-        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (-0.5f), -1073741823);
+        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (1.), 2147483647);
+        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (0.5), 1073741823);
+        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (0.), 0);
+        REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (-0.5), -1073741823);
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (-1.), -2147483647);
         REQUIRE_EQ (AudioSampleConverter<double>::sampleToThirtyTwoBitInt (std::numeric_limits<double>::lowest()), -2147483647);
     }