From e3e95e08cabfeaaa36bd0834ef1428a895bf00ba Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 25 Nov 2011 11:58:25 +0000
Subject: [PATCH] Better error report.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4606 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackMidiDriver.cpp              | 14 +++++++-------
 macosx/coremidi/JackCoreMidiDriver.cpp |  8 ++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/JackMidiDriver.cpp b/common/JackMidiDriver.cpp
index 5fd4f436..e22916c2 100644
--- a/common/JackMidiDriver.cpp
+++ b/common/JackMidiDriver.cpp
@@ -149,12 +149,12 @@ int JackMidiDriver::ProcessReadSync()
 
     // Read input buffers for the current cycle
     if (Read() < 0) {
-        jack_error("JackMidiDriver::ProcessReadSync: read error, skip cycle");
+        jack_error("JackMidiDriver::ProcessReadSync: read error");
         res = -1;
     }
 
     if (fGraphManager->ResumeRefNum(&fClientControl, fSynchroTable) < 0) {
-        jack_error("JackMidiDriver::ProcessReadSync - ResumeRefNum error");
+        jack_error("JackMidiDriver::ProcessReadSync: ResumeRefNum error");
         res = -1;
     }
 
@@ -168,13 +168,13 @@ int JackMidiDriver::ProcessWriteSync()
     if (fGraphManager->SuspendRefNum(&fClientControl, fSynchroTable,
                                      DRIVER_TIMEOUT_FACTOR *
                                      fEngineControl->fTimeOutUsecs) < 0) {
-        jack_error("JackMidiDriver::ProcessWriteSync - SuspendRefNum error");
+        jack_error("JackMidiDriver::ProcessWriteSync: SuspendRefNum error");
         res = -1;
     }
 
     // Write output buffers from the current cycle
     if (Write() < 0) {
-        jack_error("JackMidiDriver::ProcessWriteSync - Write error");
+        jack_error("JackMidiDriver::ProcessWriteSync: write error");
         res = -1;
     }
 
@@ -187,18 +187,18 @@ int JackMidiDriver::ProcessReadAsync()
 
     // Read input buffers for the current cycle
     if (Read() < 0) {
-        jack_error("JackMidiDriver::ProcessReadAsync: read error, skip cycle");
+        jack_error("JackMidiDriver::ProcessReadAsync: read error");
         res = -1;
     }
 
     // Write output buffers from the previous cycle
     if (Write() < 0) {
-        jack_error("JackMidiDriver::ProcessReadAsync - Write error");
+        jack_error("JackMidiDriver::ProcessReadAsync: write error");
         res = -1;
     }
 
     if (fGraphManager->ResumeRefNum(&fClientControl, fSynchroTable) < 0) {
-        jack_error("JackMidiDriver::ProcessReadAsync - ResumeRefNum error");
+        jack_error("JackMidiDriver::ProcessReadAsync: ResumeRefNum error");
         res = -1;
     }
 
diff --git a/macosx/coremidi/JackCoreMidiDriver.cpp b/macosx/coremidi/JackCoreMidiDriver.cpp
index c4479ed6..adf1063a 100644
--- a/macosx/coremidi/JackCoreMidiDriver.cpp
+++ b/macosx/coremidi/JackCoreMidiDriver.cpp
@@ -701,8 +701,10 @@ JackCoreMidiDriver::Read()
                 ProcessJack(GetInputBuffer(num_physical_inputs + i), buffer_size);
         }
         Unlock();
+        return 0;
+    } else {
+        return -1;
     }
-    return 0;
 }
 
 int
@@ -719,8 +721,10 @@ JackCoreMidiDriver::Write()
                             buffer_size);
         }
         Unlock();
+        return 0;
+    } else {
+        return -1;
     }
-    return 0;
 }
 
 #ifdef __cplusplus