Merge pull request #81 from jossgray/fix-warnings

Fix some warnings in the tests in Visual Studio

diff --git a/tests/testall.cpp b/tests/testall.cpp
index 419f27b630729bfb9c6d5a3d99e6fdbc8832ccab..b94ce696d194114e1f36db55fe8a46e37134af13 100644 (file)
--- a/tests/testall.cpp
+++ b/tests/testall.cpp
@@ -66,7 +66,7 @@ int sawni( void *outputBuffer, void * /*inputBuffer*/, unsigned int nBufferFrame
   if ( status )
     std::cout << "Stream underflow detected!" << std::endl;
 
-  float increment;
+  double increment;
   for ( j=0; j<channels; j++ ) {
     increment = BASE_RATE * (j+1+(j*0.1));
     for ( i=0; i<nBufferFrames; i++ ) {

diff --git a/tests/teststops.cpp b/tests/teststops.cpp
index e24c06490ab0877b8ebfcf7500c00ba0404459a5..6159b88b00fb065c259cc58d948cb77b721d0a9f 100644 (file)
--- a/tests/teststops.cpp
+++ b/tests/teststops.cpp
@@ -63,7 +63,7 @@ int pulse( void *outputBuffer, void * /*inputBuffer*/, unsigned int nBufferFrame
   if ( status ) std::cout << "Stream over/underflow detected!" << std::endl;\r
 \r
   for ( i=0; i<nBufferFrames; i++ ) {\r
-    if ( data->frameCounter % data->pulseCount == 0 ) sample = 0.9;\r
+    if ( data->frameCounter % data->pulseCount == 0 ) sample = 0.9f;\r
     else sample = 0.0;\r
     for ( j=0; j<data->channels; j++ )\r
       *buffer++ = sample;\r
@@ -107,8 +107,8 @@ int main( int argc, char *argv[] )
   // Let RtAudio print messages to stderr.\r
   adc->showWarnings( true );\r
 \r
-  runtime = RUNTIME * 1000;\r
-  pausetime = PAUSETIME * 1000;\r
+  runtime = static_cast<unsigned int>(RUNTIME * 1000);\r
+  pausetime = static_cast<unsigned int>(PAUSETIME * 1000);\r
 \r
   // Set our stream parameters for a duplex stream.\r
   bufferFrames = 512;\r
@@ -127,7 +127,7 @@ int main( int argc, char *argv[] )
     oParams.deviceId = adc->getDefaultOutputDevice();\r
 \r
   // First, test external stopStream() calls.\r
-  mydata.pulseCount = PULSE_RATE * fs;\r
+  mydata.pulseCount = static_cast<unsigned int>(PULSE_RATE * fs);\r
   mydata.nFrames = 50 * fs;\r
   mydata.returnValue = 0;\r
   try {\r