git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1248 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.59
@@ -43,7 +43,7 @@ JackEngine::JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngin | |||||
fEngineControl->fRealTime = rt; | fEngineControl->fRealTime = rt; | ||||
fEngineControl->fPriority = priority; | fEngineControl->fPriority = priority; | ||||
fEngineControl->fVerbose = ve; | fEngineControl->fVerbose = ve; | ||||
verbose = ve; | |||||
//verbose = ve; | |||||
fChannel = JackGlobals::MakeServerNotifyChannel(); | fChannel = JackGlobals::MakeServerNotifyChannel(); | ||||
fTiming = new JackEngineTiming(fClientTable, fGraphManager, fEngineControl); | fTiming = new JackEngineTiming(fClientTable, fGraphManager, fEngineControl); | ||||
fSignal = signal; | fSignal = signal; | ||||
@@ -22,7 +22,7 @@ | |||||
#include <stdio.h> | #include <stdio.h> | ||||
#include "JackError.h" | #include "JackError.h" | ||||
int verbose = 0; | |||||
int jack_verbose = 0; | |||||
EXPORT void jack_error (const char *fmt, ...) | EXPORT void jack_error (const char *fmt, ...) | ||||
{ | { | ||||
@@ -38,7 +38,7 @@ EXPORT void jack_error (const char *fmt, ...) | |||||
EXPORT void JackLog(char *fmt,...) | EXPORT void JackLog(char *fmt,...) | ||||
{ | { | ||||
#ifdef PRINTDEBUG | #ifdef PRINTDEBUG | ||||
if (verbose) { | |||||
if (jack_verbose) { | |||||
va_list ap; | va_list ap; | ||||
va_start(ap, fmt); | va_start(ap, fmt); | ||||
fprintf(stderr,"Jack: "); | fprintf(stderr,"Jack: "); | ||||
@@ -41,7 +41,7 @@ extern "C" | |||||
EXPORT void JackLog(char *fmt, ...); | EXPORT void JackLog(char *fmt, ...); | ||||
extern int verbose; | |||||
extern int jack_verbose; | |||||
#ifdef __cplusplus | #ifdef __cplusplus | ||||
} | } | ||||
@@ -90,7 +90,7 @@ int JackLibClient::Open(const char* name) | |||||
JackLibGlobals::fGlobals->fEngineControl = shared_engine; | JackLibGlobals::fGlobals->fEngineControl = shared_engine; | ||||
JackLibGlobals::fGlobals->fGraphManager = shared_ports; | JackLibGlobals::fGlobals->fGraphManager = shared_ports; | ||||
fClientControl = shared_client; | fClientControl = shared_client; | ||||
verbose = GetEngineControl()->fVerbose; | |||||
jack_verbose = GetEngineControl()->fVerbose; | |||||
} catch (int n) { | } catch (int n) { | ||||
jack_error("Map shared memory segments exception %d", n); | jack_error("Map shared memory segments exception %d", n); | ||||
goto error; | goto error; | ||||
@@ -289,7 +289,7 @@ int main(int argc, char* argv[]) | |||||
break; | break; | ||||
case 'v': | case 'v': | ||||
verbose = 1; | |||||
jack_verbose = 1; | |||||
break; | break; | ||||
case 's': | case 's': | ||||
@@ -418,7 +418,7 @@ int main(int argc, char* argv[]) | |||||
fprintf (stderr, "no access to shm registry\n"); | fprintf (stderr, "no access to shm registry\n"); | ||||
exit (3); | exit (3); | ||||
default: | default: | ||||
if (verbose) | |||||
if (jack_verbose) | |||||
fprintf (stderr, "server `%s' registered\n", | fprintf (stderr, "server `%s' registered\n", | ||||
server_name); | server_name); | ||||
} | } | ||||
@@ -448,7 +448,7 @@ int main(int argc, char* argv[]) | |||||
if (!realtime && client_timeout == 0) | if (!realtime && client_timeout == 0) | ||||
client_timeout = 500; /* 0.5 sec; usable when non realtime. */ | 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) { | if (res < 0) { | ||||
jack_error("Cannot start server... exit"); | jack_error("Cannot start server... exit"); | ||||
JackDelete(); | JackDelete(); | ||||