\96Slight simplification

diff --git a/RtAudio.cpp b/RtAudio.cpp
index 41b6b6abe1f8a68ccbe18bf908242ca9cfbf794e..308a24471919d03e3e0a80842568e386da2d2087 100644 (file)
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -3926,7 +3926,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             char fromSample = ( ( char* ) inBuffer )[ ( inSample * channelCount ) + channel ];\r
             char toSample = ( ( char* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ];\r
-            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( char* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( char ) sampleDiff;\r
           }\r
           break;\r
@@ -3937,7 +3937,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             short fromSample = ( ( short* ) inBuffer )[ ( inSample * channelCount ) + channel ];\r
             short toSample = ( ( short* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ];\r
-            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( short* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( short ) sampleDiff;\r
           }\r
           break;\r
@@ -3948,7 +3948,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             int fromSample = ( ( S24* ) inBuffer )[ ( inSample * channelCount ) + channel ].asInt();\r
             int toSample = ( ( S24* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ].asInt();\r
-            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( S24* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff;\r
           }\r
           break;\r
@@ -3959,7 +3959,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             int fromSample = ( ( int* ) inBuffer )[ ( inSample * channelCount ) + channel ];\r
             int toSample = ( ( int* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ];\r
-            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( int* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + ( int ) sampleDiff;\r
           }\r
           break;\r
@@ -3970,7 +3970,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             float fromSample = ( ( float* ) inBuffer )[ ( inSample * channelCount ) + channel ];\r
             float toSample = ( ( float* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ];\r
-            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            float sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( float* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff;\r
           }\r
           break;\r
@@ -3981,7 +3981,7 @@ void convertBufferWasapi( char* outBuffer,
           {\r
             double fromSample = ( ( double* ) inBuffer )[ ( inSample * channelCount ) + channel ];\r
             double toSample = ( ( double* ) inBuffer )[ ( ( inSample + 1 ) * channelCount ) + channel ];\r
-            double sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - floor( inSampleFraction ) );\r
+            double sampleDiff = ( toSample - fromSample ) * ( inSampleFraction - inSample );\r
             ( ( double* ) outBuffer )[ ( outSample * channelCount ) + channel ] = fromSample + sampleDiff;\r
           }\r
           break;\r