Some error printing changes, removed ALSA global sequencer objects because they were not thread safe, various other updates suggested by Martin Koegler

10 files changed, 8 insertions, 28 deletions

diff --git a/tests/cmidiin.cpp b/tests/cmidiin.cpp
index ad6cbd5..5aa4053 100644
--- a/tests/cmidiin.cpp
+++ b/tests/cmidiin.cpp
@@ -60,7 +60,7 @@ int main( int argc, char *argv[] )
     char input;
     std::cin.get(input);
 
-  } catch ( RtError &error ) {
+  } catch ( RtMidiError &error ) {
     error.printMessage();
   }
 
diff --git a/tests/cmidiin.dsp b/tests/cmidiin.dsp
index cacda20..55fcbe6 100644
--- a/tests/cmidiin.dsp
+++ b/tests/cmidiin.dsp
@@ -99,10 +99,6 @@ SOURCE=..\RtMidi.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\RtError.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\RtMidi.h

 # End Source File

 # End Group

diff --git a/tests/midiout.cpp b/tests/midiout.cpp
index 4da65c1..0a9b9fd 100644
--- a/tests/midiout.cpp
+++ b/tests/midiout.cpp
@@ -33,7 +33,7 @@ int main( int argc, char *argv[] )
   try {
     midiout = new RtMidiOut();
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     exit( EXIT_FAILURE );
   }
@@ -42,7 +42,7 @@ int main( int argc, char *argv[] )
   try {
     if ( chooseMidiPort( midiout ) == false ) goto cleanup;
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     goto cleanup;
   }
diff --git a/tests/midiout.dsp b/tests/midiout.dsp
index 3f9480f..48e5811 100644
--- a/tests/midiout.dsp
+++ b/tests/midiout.dsp
@@ -99,10 +99,6 @@ SOURCE=..\RtMidi.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\RtError.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\RtMidi.h

 # End Source File

 # End Group

diff --git a/tests/midiprobe.cpp b/tests/midiprobe.cpp
index 7a7452e..6576e15 100644
--- a/tests/midiprobe.cpp
+++ b/tests/midiprobe.cpp
@@ -61,7 +61,7 @@ int main()
     }
     std::cout << std::endl;
 
-  } catch ( RtError &error ) {
+  } catch ( RtMidiError &error ) {
     error.printMessage();
   }
 
diff --git a/tests/midiprobe.dsp b/tests/midiprobe.dsp
index 0f79fce..6a5eeaa 100644
--- a/tests/midiprobe.dsp
+++ b/tests/midiprobe.dsp
@@ -99,10 +99,6 @@ SOURCE=..\RtMidi.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\RtError.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\RtMidi.h

 # End Source File

 # End Group

diff --git a/tests/qmidiin.cpp b/tests/qmidiin.cpp
index de8337e..2adc03d 100644
--- a/tests/qmidiin.cpp
+++ b/tests/qmidiin.cpp
@@ -46,7 +46,7 @@ int main( int argc, char *argv[] )
   try {
     midiin = new RtMidiIn();
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     exit( EXIT_FAILURE );
   }
@@ -64,7 +64,7 @@ int main( int argc, char *argv[] )
   try {
     midiin->openPort( port );
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     goto cleanup;
   }
diff --git a/tests/qmidiin.dsp b/tests/qmidiin.dsp
index 9b66f7e..77f4818 100644
--- a/tests/qmidiin.dsp
+++ b/tests/qmidiin.dsp
@@ -99,10 +99,6 @@ SOURCE=..\RtMidi.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\RtError.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\RtMidi.h

 # End Source File

 # End Group

diff --git a/tests/sysextest.cpp b/tests/sysextest.cpp
index a11ec16..68b9a0d 100644
--- a/tests/sysextest.cpp
+++ b/tests/sysextest.cpp
@@ -56,7 +56,7 @@ int main( int argc, char *argv[] )
     midiout = new RtMidiOut();
     midiin = new RtMidiIn();
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     goto cleanup;
   }
@@ -69,7 +69,7 @@ int main( int argc, char *argv[] )
     if ( chooseMidiPort( midiin ) == false ) goto cleanup;
     if ( chooseMidiPort( midiout ) == false ) goto cleanup;
   }
-  catch ( RtError &error ) {
+  catch ( RtMidiError &error ) {
     error.printMessage();
     goto cleanup;
   }
diff --git a/tests/sysextest.dsp b/tests/sysextest.dsp
index 84ce289..0af5bf3 100644
--- a/tests/sysextest.dsp
+++ b/tests/sysextest.dsp
@@ -99,10 +99,6 @@ SOURCE=.\sysextest.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\RtError.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\RtMidi.h

 # End Source File

 # End Group