From 59e79b856df803cf874ffdb6b78166106ef72155 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 23 Sep 2006 08:37:25 +0000
Subject: [PATCH] Rename global verbose in jack_verbose to avoid symbol clash
 with PureData

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1249 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                         | 6 +++++-
 common/JackClient.cpp             | 2 --
 common/JackEngine.cpp             | 1 -
 common/JackServer.cpp             | 1 +
 tests/testAtomic.cpp              | 2 --
 tests/testSem.cpp                 | 2 --
 tests/testSynchroClient.cpp       | 2 --
 tests/testSynchroServer.cpp       | 2 --
 tests/testSynchroServerClient.cpp | 2 --
 9 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70aab6ec..45f5e7c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ---------------------------
   Jackdmp changes log
----------------------------
+---------------------------
+
+2006-09-23  Stephane Letz  <letz@grame.fr>
+
+	* Rename global "verbose" in "jack_verbose" to avoid symbol clash with PureData.
 
 2006-09-20  Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackClient.cpp b/common/JackClient.cpp
index d1818f1d..4fffd7fc 100644
--- a/common/JackClient.cpp
+++ b/common/JackClient.cpp
@@ -29,8 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <math.h>
 #include <string>
 
-//int verbose = 0;
-
 using namespace std;
 
 namespace Jack
diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index 07a9625a..be083677 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -43,7 +43,6 @@ JackEngine::JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngin
     fEngineControl->fRealTime = rt;
     fEngineControl->fPriority = priority;
     fEngineControl->fVerbose = ve;
-    //verbose = ve;
     fChannel = JackGlobals::MakeServerNotifyChannel();
     fTiming = new JackEngineTiming(fClientTable, fGraphManager, fEngineControl);
     fSignal = signal;
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 269b41fd..92c8991f 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -60,6 +60,7 @@ JackServer::JackServer(bool sync, long timeout, bool rt, long priority, long loo
     fDriverInfo = NULL;
     fAudioDriver = NULL;
     fInstance = this; // Unique instance
+	jack_verbose = verbose;
 }
 
 JackServer::~JackServer()
diff --git a/tests/testAtomic.cpp b/tests/testAtomic.cpp
index 52fc8df2..1e34e63e 100644
--- a/tests/testAtomic.cpp
+++ b/tests/testAtomic.cpp
@@ -25,8 +25,6 @@
 
 using namespace Jack;
 
-//int verbose = 0;
-
 #define SIZE 1024
 
 struct TestState {
diff --git a/tests/testSem.cpp b/tests/testSem.cpp
index 1e531ccc..48835abd 100644
--- a/tests/testSem.cpp
+++ b/tests/testSem.cpp
@@ -32,8 +32,6 @@
 
 #define ITER 500000
 
-//int verbose = 0;
-
 using namespace Jack;
 
 struct ServerThread : public JackRunnableInterface {
diff --git a/tests/testSynchroClient.cpp b/tests/testSynchroClient.cpp
index 7a5a2058..af31aa49 100644
--- a/tests/testSynchroClient.cpp
+++ b/tests/testSynchroClient.cpp
@@ -57,8 +57,6 @@
 
 using namespace Jack;
 
-//int verbose = 0;
-
 class Test2 : public JackRunnableInterface
 {
 
diff --git a/tests/testSynchroServer.cpp b/tests/testSynchroServer.cpp
index fb524b76..ec9df768 100644
--- a/tests/testSynchroServer.cpp
+++ b/tests/testSynchroServer.cpp
@@ -55,8 +55,6 @@
 #define SERVER "serveur3"
 #define CLIENT "client3"
 
-//int verbose = 0;
-
 using namespace Jack;
 
 #ifdef WIN32
diff --git a/tests/testSynchroServerClient.cpp b/tests/testSynchroServerClient.cpp
index 4761acee..acaeafcf 100644
--- a/tests/testSynchroServerClient.cpp
+++ b/tests/testSynchroServerClient.cpp
@@ -56,8 +56,6 @@
 #define SERVER "serveur1"
 #define CLIENT "client1"
 
-//int verbose = 0;
-
 using namespace Jack;
 
 #ifdef WIN32