From ee50d19e005bf488e949b0f6fd8639d65ed54535 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 19 Jan 2007 21:50:50 +0000
Subject: [PATCH] More debug messages

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1356 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackEngine.cpp | 6 +++---
 common/JackServer.cpp | 7 ++++---
 common/JackSocket.cpp | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index 9888c022..d70bca93 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -486,7 +486,7 @@ int JackEngine::ClientCloseAux(int refnum, JackClientInterface* client, bool wai
     // Wait until next cycle to be sure client is not used anymore
     if (wait) {
         if (!fSignal->TimedWait(fEngineControl->fTimeOutUsecs * 2)) { // Must wait at least until a switch occurs in Process, even in case of graph end failure
-            JackLog("JackEngine::ClientCloseAux wait error ref = %ld \n", refnum);
+            jack_error("JackEngine::ClientCloseAux wait error ref = %ld", refnum);
         }
     }
 
@@ -507,7 +507,7 @@ int JackEngine::ClientActivate(int refnum)
 	JackLog("JackEngine::ClientActivate ref = %ld name = %s\n", refnum, client->GetClientControl()->fName);
 	// Wait for graph state change to be effective
 	if (!fSignal->TimedWait(fEngineControl->fPeriodUsecs * 10)) {
-		JackLog("JackEngine::ClientActivate wait error ref = %ld name = %s\n", refnum, client->GetClientControl()->fName);
+		jack_error("JackEngine::ClientActivate wait error ref = %ld name = %s", refnum, client->GetClientControl()->fName);
 		return -1;
 	} else {
 		NotifyActivate(refnum);
@@ -526,7 +526,7 @@ int JackEngine::ClientDeactivate(int refnum)
 	fGraphManager->DisconnectAllPorts(refnum);
 	// Wait for graph state change to be effective
 	if (!fSignal->TimedWait(fEngineControl->fPeriodUsecs * 10)) {
-		JackLog("JackEngine::ClientDeactivate wait error ref = %ld name = %s\n", refnum, client->GetClientControl()->fName);
+		jack_error("JackEngine::ClientDeactivate wait error ref = %ld name = %s", refnum, client->GetClientControl()->fName);
 		return -1;
 	} else {
 		return 0;
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 2b74e0d1..22f6f9bb 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -305,9 +305,10 @@ void JackServer::Notify(int refnum, int notify, int value)
 
         case JackNotifyChannelInterface::kDeadClient:
             JackLog("JackServer: kDeadClient ref = %ld\n", refnum);
-            Deactivate(refnum);
-            fEngine->ClientClose(refnum);
-            break;
+            if (Deactivate(refnum) < 0)
+				jack_error("JackServer: DeadClient ref = %ld cannot be removed from the graph !!\n", refnum);
+			fEngine->ClientClose(refnum);
+			break;
     }
 }
 
diff --git a/common/JackSocket.cpp b/common/JackSocket.cpp
index c0500081..77d6c0e3 100644
--- a/common/JackSocket.cpp
+++ b/common/JackSocket.cpp
@@ -123,7 +123,6 @@ int JackClientSocket::Close()
 int JackClientSocket::Read(void* data, int len)
 {
     int len1;
-    JackLog("JackClientSocket::Read len = %ld\n", len);
 
     if ((len1 = read(fSocket, data, len)) != len) {
         jack_error("Cannot read socket %d %d (%s)", len, len1, strerror(errno));