Merge 3.0 into releases

1 files changed, 26 insertions, 23 deletions

diff --git a/tests/call_inout.cpp b/tests/call_inout.cpp
index 787a856..e941e1e 100644
--- a/tests/call_inout.cpp
+++ b/tests/call_inout.cpp
@@ -1,6 +1,6 @@
 /******************************************/
 /*
-  call_inout.c
+  call_inout.cpp
   by Gary P. Scavone, 2001
 
   Records from default input and passes it
@@ -11,36 +11,36 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 
 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_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
 
 void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: call_inout 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: call_inout 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);
 }
 
@@ -52,7 +52,7 @@ int inout(char *buffer, int buffer_size, void *)
 
 int main(int argc, char *argv[])
 {
-  int stream, chans, fs, device = 0;
+  int chans, fs, device = 0;
   RtAudio *audio;
   char input;
 
@@ -67,32 +67,35 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   int buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, device, chans, device, chans,
+    audio = new RtAudio(device, chans, device, chans,
                         FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   try {
-    audio->setStreamCallback(stream, &inout, NULL);
-    audio->startStream(stream);
+    audio->setStreamCallback(&inout, NULL);
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nRunning ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
-  cin.get(input);
+  std::cout << "\nRunning ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
+  std::cin.get(input);
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
 
   return 0;