Check for '#if defined( WIN32 )' in test apps

[rtaudio-cdist.git] / tests / teststops.cpp

diff --git a/tests/teststops.cpp b/tests/teststops.cpp
index 61227346458715515381779635597cab5780d878..0b85b48f4a8690da73c3a958a17346049378552e 100644 (file)
--- a/tests/teststops.cpp
+++ b/tests/teststops.cpp
@@ -21,7 +21,7 @@
 #define REPETITIONS 10\r
 \r
 // Platform-dependent sleep routines.\r
-#if defined( __WINDOWS_ASIO__ ) || defined( __WINDOWS_DS__ )\r
+#if defined( WIN32 )\r
   #include <windows.h>\r
   #define SLEEP( milliseconds ) Sleep( (DWORD) milliseconds ) \r
 #else // Unix variants\r
@@ -51,8 +51,8 @@ struct MyData {
 };\r
 \r
 // Interleaved buffers\r
-int pulse( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,\r
-           double streamTime, RtAudioStreamStatus status, void *mydata )\r
+int pulse( void *outputBuffer, void * /*inputBuffer*/, unsigned int nBufferFrames,\r
+           double /*streamTime*/, RtAudioStreamStatus status, void *mydata )\r
 {\r
   // Write out a pulse signal and ignore the input buffer.\r
   unsigned int i, j;\r
@@ -63,7 +63,7 @@ int pulse( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
   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,11 +107,11 @@ 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 = 256;\r
+  bufferFrames = 512;\r
   RtAudio::StreamParameters oParams, iParams;\r
   oParams.deviceId = oDevice;\r
   oParams.nChannels = mydata.channels;\r
@@ -121,8 +121,13 @@ int main( int argc, char *argv[] )
   iParams.nChannels = mydata.channels;\r
   iParams.firstChannel = iOffset;\r
 \r
+  if ( iDevice == 0 )\r
+    iParams.deviceId = adc->getDefaultInputDevice();\r
+  if ( oDevice == 0 )\r
+    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
@@ -141,7 +146,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );\r
     }\r
   }\r
-  catch ( RtError& e ) {\r
+  catch ( RtAudioError& e ) {\r
     e.printMessage();\r
     goto cleanup;\r
   }\r
@@ -168,7 +173,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );\r
     }\r
   }\r
-  catch ( RtError& e ) {\r
+  catch ( RtAudioError& e ) {\r
     e.printMessage();\r
     goto cleanup;\r
   }\r
@@ -193,7 +198,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );\r
     }\r
   }\r
-  catch ( RtError& e ) {\r
+  catch ( RtAudioError& e ) {\r
     e.printMessage();\r
     goto cleanup;\r
   }\r
@@ -222,7 +227,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );\r
     }\r
   }\r
-  catch ( RtError& e ) {\r
+  catch ( RtAudioError& e ) {\r
     e.printMessage();\r
     goto cleanup;\r
   }\r
@@ -253,7 +258,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );\r
     }\r
   }\r
-  catch ( RtError& e ) {\r
+  catch ( RtAudioError& e ) {\r
     e.printMessage();\r
     goto cleanup;\r
   }\r