Merge 3.0 into releases

1 files changed, 27 insertions, 23 deletions

diff --git a/tests/record_raw.cpp b/tests/record_raw.cpp
index 1b79644..717ce2c 100644
--- a/tests/record_raw.cpp
+++ b/tests/record_raw.cpp
@@ -10,29 +10,29 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 #include <stdio.h>
 
 /*
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 */
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 
 /*
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 */
 
 #define TIME   2.0
@@ -41,16 +41,16 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: record_raw N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: record_raw N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, stream, device = 0;
+  int chans, fs, buffer_size, device = 0;
   long frames, counter = 0;
   MY_TYPE *buffer;
   FILE *fd;
@@ -67,10 +67,11 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, 0, 0, device, chans,
+    audio = new RtAudio(0, 0, device, chans,
                         FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
@@ -78,20 +79,22 @@ int main(int argc, char *argv[])
   frames = (long) (fs * TIME);
 
   try {
-    buffer = (MY_TYPE *) audio->getStreamBuffer(stream);
-    audio->startStream(stream);
+    buffer = (MY_TYPE *) audio->getStreamBuffer();
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nRecording for " << TIME << " seconds ... writing file test.raw (buffer size = " << buffer_size << ")." << endl;
+  std::cout << "\nRecording for " << TIME << " seconds ... writing file test.raw (buffer size = " << buffer_size << ")." << std::endl;
   while (counter < frames) {
 
     try {
-      audio->tickStream(stream);
+      audio->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
@@ -100,13 +103,14 @@ int main(int argc, char *argv[])
   }
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
   fclose(fd);