Merge 2.1 into releases

1 files changed, 12 insertions, 7 deletions

diff --git a/tests/record_raw.cpp b/tests/record_raw.cpp
index 04041ee..1b79644 100644
--- a/tests/record_raw.cpp
+++ b/tests/record_raw.cpp
@@ -10,6 +10,7 @@
 /******************************************/
 
 #include "RtAudio.h"
+#include <iostream.h>
 #include <stdio.h>
 
 /*
@@ -24,13 +25,15 @@ typedef signed long  MY_TYPE;
 
 typedef signed long  MY_TYPE;
 #define FORMAT RtAudio::RTAUDIO_SINT32
+*/
 
 typedef float  MY_TYPE;
 #define FORMAT RtAudio::RTAUDIO_FLOAT32
-*/
 
+/*
 typedef double  MY_TYPE;
 #define FORMAT RtAudio::RTAUDIO_FLOAT64
+*/
 
 #define TIME   2.0
 
@@ -38,29 +41,31 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: record_raw N fs\n";
+  cout << "\nuseage: record_raw 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;
   FILE *fd;
   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, 0, 0, device, chans,
                         FORMAT, fs, &buffer_size, 8);
@@ -80,7 +85,7 @@ int main(int argc, char *argv[])
     goto cleanup;
   }
 
-  cout << "\nRecording for " << TIME << " seconds ... writing file test.raw." << endl;
+  cout << "\nRecording for " << TIME << " seconds ... writing file test.raw (buffer size = " << buffer_size << ")." << endl;
   while (counter < frames) {
 
     try {