1 files changed, 21 insertions, 41 deletions
diff --git a/tests/midiprobe.cpp b/tests/midiprobe.cpp
index 06d9497..e9ba757 100644
--- a/tests/midiprobe.cpp
+++ b/tests/midiprobe.cpp
@@ -13,57 +13,37 @@ int main()
   RtMidiIn  *midiin = 0;
   RtMidiOut *midiout = 0;
 
-  // RtMidiIn constructor
   try {
+
+    // RtMidiIn constructor ... exception possible
     midiin = new RtMidiIn();
-  }
-  catch ( RtError &error ) {
-    error.printMessage();
-    exit( EXIT_FAILURE );
-  }
 
-  // Check inputs.
-  unsigned int nPorts = midiin->getPortCount();
-  std::cout << "\nThere are " << nPorts << " MIDI input sources available.\n";
-  std::string portName;
-  unsigned int i;
-  for ( i=0; i<nPorts; i++ ) {
-    try {
-      portName = midiin->getPortName(i);
-    }
-    catch ( RtError &error ) {
-      error.printMessage();
-      goto cleanup;
+    // Check inputs.
+    unsigned int nPorts = midiin->getPortCount();
+    std::cout << "\nThere are " << nPorts << " MIDI input sources available.\n";
+
+    for ( unsigned i=0; i<nPorts; i++ ) {
+      std::string portName = midiin->getPortName(i);
+      std::cout << "  Input Port #" << i+1 << ": " << portName << '\n';
     }
-    std::cout << "  Input Port #" << i+1 << ": " << portName << '\n';
-  }
 
-  // RtMidiOut constructor
-  try {
+    // RtMidiOut constructor ... exception possible
     midiout = new RtMidiOut();
-  }
-  catch ( RtError &error ) {
-    error.printMessage();
-    exit( EXIT_FAILURE );
-  }
 
-  // Check outputs.
-  nPorts = midiout->getPortCount();
-  std::cout << "\nThere are " << nPorts << " MIDI output ports available.\n";
-  for ( i=0; i<nPorts; i++ ) {
-    try {
-      portName = midiout->getPortName(i);
-    }
-    catch ( RtError &error ) {
-      error.printMessage();
-      goto cleanup;
+    // Check outputs.
+    nPorts = midiout->getPortCount();
+    std::cout << "\nThere are " << nPorts << " MIDI output ports available.\n";
+
+    for ( unsigned i=0; i<nPorts; i++ ) {
+      std::string portName = midiout->getPortName(i);
+      std::cout << "  Output Port #" << i+1 << ": " << portName << std::endl;
     }
-    std::cout << "  Output Port #" << i+1 << ": " << portName << '\n';
+    std::cout << std::endl;
+
+  } catch ( RtError &error ) {
+    error.printMessage();
   }
-  std::cout << '\n';
 
-  // Clean up
- cleanup:
   delete midiin;
   delete midiout;