From ef92a6f0256ae97c4d482b34c2903aac6e1bb179 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 23 Sep 2006 08:23:42 +0000
Subject: [PATCH] Rename global verbose in jack_verbose

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1248 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackEngine.cpp    | 2 +-
 common/JackError.c       | 4 ++--
 common/JackError.h       | 2 +-
 common/JackLibClient.cpp | 2 +-
 common/Jackdmp.cpp       | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index c4a244a4..07a9625a 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -43,7 +43,7 @@ JackEngine::JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngin
     fEngineControl->fRealTime = rt;
     fEngineControl->fPriority = priority;
     fEngineControl->fVerbose = ve;
-    verbose = ve;
+    //verbose = ve;
     fChannel = JackGlobals::MakeServerNotifyChannel();
     fTiming = new JackEngineTiming(fClientTable, fGraphManager, fEngineControl);
     fSignal = signal;
diff --git a/common/JackError.c b/common/JackError.c
index 251ff969..0df6febb 100644
--- a/common/JackError.c
+++ b/common/JackError.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "JackError.h"
 
-int verbose = 0;
+int jack_verbose = 0;
 
 EXPORT void jack_error (const char *fmt, ...)
 {
@@ -38,7 +38,7 @@ EXPORT void jack_error (const char *fmt, ...)
 EXPORT void JackLog(char *fmt,...)
 {
 #ifdef PRINTDEBUG
-	if (verbose) {
+	if (jack_verbose) {
 		va_list ap;
 		va_start(ap, fmt);
 		fprintf(stderr,"Jack: ");
diff --git a/common/JackError.h b/common/JackError.h
index 42baefb4..afbf7bf5 100644
--- a/common/JackError.h
+++ b/common/JackError.h
@@ -41,7 +41,7 @@ extern "C"
 
     EXPORT void JackLog(char *fmt, ...);
 
-    extern int verbose;
+    extern int jack_verbose;
 
 #ifdef __cplusplus
 }
diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp
index 6e0b0864..85ab49e0 100644
--- a/common/JackLibClient.cpp
+++ b/common/JackLibClient.cpp
@@ -90,7 +90,7 @@ int JackLibClient::Open(const char* name)
         JackLibGlobals::fGlobals->fEngineControl = shared_engine;
         JackLibGlobals::fGlobals->fGraphManager = shared_ports;
         fClientControl = shared_client;
-        verbose = GetEngineControl()->fVerbose;
+        jack_verbose = GetEngineControl()->fVerbose;
     } catch (int n) {
         jack_error("Map shared memory segments exception %d", n);
         goto error;
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index 747e880a..eca13daf 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -289,7 +289,7 @@ int main(int argc, char* argv[])
                 break;
 
             case 'v':
-                verbose = 1;
+                jack_verbose = 1;
                 break;
 
             case 's':
@@ -418,7 +418,7 @@ int main(int argc, char* argv[])
             fprintf (stderr, "no access to shm registry\n");
             exit (3);
         default:
-            if (verbose)
+            if (jack_verbose)
                 fprintf (stderr, "server `%s' registered\n",
                          server_name);
     }
@@ -448,7 +448,7 @@ int main(int argc, char* argv[])
     if (!realtime && client_timeout == 0)
         client_timeout = 500; /* 0.5 sec; usable when non realtime. */
 
-    int res = JackStart(driver_desc, driver_params, sync, client_timeout, realtime, realtime_priority, loopback, verbose);
+    int res = JackStart(driver_desc, driver_params, sync, client_timeout, realtime, realtime_priority, loopback, jack_verbose);
     if (res < 0) {
         jack_error("Cannot start server... exit");
         JackDelete();