Merge pull request #48 from radarsat1/duplex-64-compat

[rtaudio.git] / tests / teststops.cpp

diff --git a/tests/teststops.cpp b/tests/teststops.cpp
index 61227346458715515381779635597cab5780d878..e24c06490ab0877b8ebfcf7500c00ba0404459a5 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( __WINDOWS_ASIO__ ) || defined( __WINDOWS_DS__ ) || defined( __WINDOWS_WASAPI__ )\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
@@ -111,7 +111,7 @@ int main( int argc, char *argv[] )
   pausetime = 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,6 +121,11 @@ 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.nFrames = 50 * fs;\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