Merge 2.1 into releases

1 files changed, 8 insertions, 6 deletions

diff --git a/tests/call_twostreams.cpp b/tests/call_twostreams.cpp
index f13343a..4af0eac 100644
--- a/tests/call_twostreams.cpp
+++ b/tests/call_twostreams.cpp
@@ -3,7 +3,7 @@
   twostreams.cpp
   by Gary P. Scavone, 2001
 
-  Text executable using two streams with
+  Test executable using two streams with
   callbacks.
 */
 /******************************************/
@@ -41,9 +41,10 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: call_twostreams N fs\n";
+  cout << "\nuseage: call_twostreams N fs <device>\n";
   cout << "    where N = number of channels,\n";
-  cout << "    and fs = the sample rate.\n\n";
+  cout << "    fs = the sample rate,\n";
+  cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
@@ -75,20 +76,21 @@ int out(char *buffer, int buffer_size, void *data)
 
 int main(int argc, char *argv[])
 {
-  int device, buffer_size, stream1, stream2, fs;
+  int buffer_size, stream1 = 0, stream2 = 0, fs, device = 0;
   MY_TYPE *data = 0;
   RtAudio *audio;
   char input;
 
   // minimal command-line checking
-  if (argc != 3) usage();
+  if (argc != 3 && argc != 4 ) usage();
 
   chans = (int) atoi(argv[1]);
   fs = (int) atoi(argv[2]);
+  if ( argc == 4 )
+    device = (int) atoi(argv[3]);
 
   // Open the realtime output device
   buffer_size = 512;
-  device = 0; // default device
   try {
     audio = new RtAudio();
   }