Renamed RtError class to RtAudioError and embedded it in RtAudio.h.

Deleted RtError.h from distribution and renamed all references to
RtError in the documentation, test files, and Windows .dsp files.
The version number was incremented to 4.1.0 in anticipation of
the next release, as this change affects the API.

13 files changed, 15 insertions, 43 deletions

diff --git a/tests/Windows/audioprobe.dsp b/tests/Windows/audioprobe.dsp
index 679bf9a..cbdc11a 100755
--- a/tests/Windows/audioprobe.dsp
+++ b/tests/Windows/audioprobe.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/duplex.dsp b/tests/Windows/duplex.dsp
index c9ba294..0073640 100755
--- a/tests/Windows/duplex.dsp
+++ b/tests/Windows/duplex.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/playraw.dsp b/tests/Windows/playraw.dsp
index 849890d..4da8d9c 100755
--- a/tests/Windows/playraw.dsp
+++ b/tests/Windows/playraw.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/playsaw.dsp b/tests/Windows/playsaw.dsp
index 7923c1c..e2bcfe5 100755
--- a/tests/Windows/playsaw.dsp
+++ b/tests/Windows/playsaw.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/record.dsp b/tests/Windows/record.dsp
index 9ba312c..b1c2dc0 100755
--- a/tests/Windows/record.dsp
+++ b/tests/Windows/record.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/testall.dsp b/tests/Windows/testall.dsp
index 72b6259..87b25bb 100755
--- a/tests/Windows/testall.dsp
+++ b/tests/Windows/testall.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/Windows/teststops.dsp b/tests/Windows/teststops.dsp
index 1543bc8..71d2fff 100755
--- a/tests/Windows/teststops.dsp
+++ b/tests/Windows/teststops.dsp
@@ -149,10 +149,6 @@ SOURCE=..\..\include\iasiothiscallresolver.h
 

 SOURCE=..\..\RtAudio.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\RtError.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/tests/duplex.cpp b/tests/duplex.cpp
index 2c60aad..60be901 100644
--- a/tests/duplex.cpp
+++ b/tests/duplex.cpp
@@ -103,7 +103,7 @@ int main( int argc, char *argv[] )
   try {
     adac.openStream( &oParams, &iParams, FORMAT, fs, &bufferFrames, &inout, (void *)&bufferBytes, &options );
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     exit( 1 );
   }
@@ -123,7 +123,7 @@ int main( int argc, char *argv[] )
     // Stop the stream.
     adac.stopStream();
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     goto cleanup;
   }
diff --git a/tests/playraw.cpp b/tests/playraw.cpp
index f57c0b0..7e7256b 100644
--- a/tests/playraw.cpp
+++ b/tests/playraw.cpp
@@ -130,7 +130,7 @@ int main( int argc, char *argv[] )
     dac.openStream( &oParams, NULL, FORMAT, fs, &bufferFrames, &output, (void *)&data );
     dac.startStream();
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     goto cleanup;
   }
diff --git a/tests/playsaw.cpp b/tests/playsaw.cpp
index 100d8d9..a590ca1 100644
--- a/tests/playsaw.cpp
+++ b/tests/playsaw.cpp
@@ -172,7 +172,7 @@ int main( int argc, char *argv[] )
     dac.openStream( &oParams, NULL, FORMAT, fs, &bufferFrames, &saw, (void *)data, &options );
     dac.startStream();
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     e.printMessage();
     goto cleanup;
   }
@@ -190,7 +190,7 @@ int main( int argc, char *argv[] )
       // Stop the stream
       dac.stopStream();
     }
-    catch ( RtError& e ) {
+    catch ( RtAudioError& e ) {
       e.printMessage();
     }
   }
diff --git a/tests/record.cpp b/tests/record.cpp
index 5aa0ef3..4bd9d30 100644
--- a/tests/record.cpp
+++ b/tests/record.cpp
@@ -126,7 +126,7 @@ int main( int argc, char *argv[] )
   try {
     adc.openStream( NULL, &iParams, FORMAT, fs, &bufferFrames, &input, (void *)&data );
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     goto cleanup;
   }
@@ -148,7 +148,7 @@ int main( int argc, char *argv[] )
   try {
     adc.startStream();
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     goto cleanup;
   }
diff --git a/tests/testall.cpp b/tests/testall.cpp
index f518a57..c8db735 100644
--- a/tests/testall.cpp
+++ b/tests/testall.cpp
@@ -160,7 +160,7 @@ int main( int argc, char *argv[] )
     std::cout << "Playing again ... press <enter> to close the stream.\n";
     std::cin.get( input );
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     e.printMessage();
     goto cleanup;
   }
@@ -180,7 +180,7 @@ int main( int argc, char *argv[] )
     std::cout << "\nPlaying ... press <enter> to stop.\n";
     std::cin.get( input );
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     e.printMessage();
     goto cleanup;
   }
@@ -216,7 +216,7 @@ int main( int argc, char *argv[] )
     std::cout << "\nRunning ... press <enter> to stop.\n";
     std::cin.get( input );
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     e.printMessage();
   }
 
diff --git a/tests/teststops.cpp b/tests/teststops.cpp
index ab71dbd..b74a66e 100644
--- a/tests/teststops.cpp
+++ b/tests/teststops.cpp
@@ -141,7 +141,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );

     }

   }

-  catch ( RtError& e ) {

+  catch ( RtAudioError& e ) {

     e.printMessage();

     goto cleanup;

   }

@@ -168,7 +168,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );

     }

   }

-  catch ( RtError& e ) {

+  catch ( RtAudioError& e ) {

     e.printMessage();

     goto cleanup;

   }

@@ -193,7 +193,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );

     }

   }

-  catch ( RtError& e ) {

+  catch ( RtAudioError& e ) {

     e.printMessage();

     goto cleanup;

   }

@@ -222,7 +222,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );

     }

   }

-  catch ( RtError& e ) {

+  catch ( RtAudioError& e ) {

     e.printMessage();

     goto cleanup;

   }

@@ -253,7 +253,7 @@ int main( int argc, char *argv[] )
       SLEEP( pausetime );

     }

   }

-  catch ( RtError& e ) {

+  catch ( RtAudioError& e ) {

     e.printMessage();

     goto cleanup;

   }