Merge 2.1 into releases

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/in_out.cpp b/tests/in_out.cpp
index 131d57b..053f620 100644
--- a/tests/in_out.cpp
+++ b/tests/in_out.cpp
@@ -39,28 +39,30 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: in_out N fs\n";
+  cout << "\nuseage: in_out 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);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, device, buffer_size, stream;
+  int chans, fs, buffer_size, stream, device = 0;
   long frames, counter = 0;
   MY_TYPE *buffer;
   RtAudio *audio;
 
   // 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(&stream, device, chans, device, chans,
                         FORMAT, fs, &buffer_size, 8);