git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1967 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.71
| @@ -42,7 +42,7 @@ namespace Jack | |||||
| JackServer* JackServer::fInstance = NULL; | JackServer* JackServer::fInstance = NULL; | ||||
| JackServer::JackServer(bool sync, bool temporary, long timeout, bool rt, long priority, long loopback, bool verbose, const char* server_name) | |||||
| JackServer::JackServer(bool sync, bool temporary, long timeout, bool rt, long priority, long loopback, bool verbose, const char* server_name) | |||||
| { | { | ||||
| JackGlobals::InitServer(); | JackGlobals::InitServer(); | ||||
| for (int i = 0; i < CLIENT_NUM; i++) | for (int i = 0; i < CLIENT_NUM; i++) | ||||
| @@ -54,8 +54,7 @@ class EXPORT JackServer | |||||
| JackEngineControl* fEngineControl; | JackEngineControl* fEngineControl; | ||||
| JackGraphManager* fGraphManager; | JackGraphManager* fGraphManager; | ||||
| JackServerChannelInterface* fChannel; | JackServerChannelInterface* fChannel; | ||||
| //JackConnectionManager* fConnectionState; | |||||
| JackConnectionManager fConnectionState; | |||||
| JackConnectionManager fConnectionState; | |||||
| JackSynchro* fSynchroTable[CLIENT_NUM]; | JackSynchro* fSynchroTable[CLIENT_NUM]; | ||||
| bool fFreewheel; | bool fFreewheel; | ||||
| long fLoopback; | long fLoopback; | ||||
| @@ -99,7 +99,7 @@ void LockAllMemory() | |||||
| if (CHECK_MLOCKALL()) { | if (CHECK_MLOCKALL()) { | ||||
| jack_log("Succeeded in locking all memory"); | jack_log("Succeeded in locking all memory"); | ||||
| } else { | } else { | ||||
| jack_error("Cannot lock down memory area (%s)", strerror(errno)); | |||||
| jack_error("Cannot lock all memory (%s)", strerror(errno)); | |||||
| } | } | ||||
| } | } | ||||
| @@ -108,7 +108,7 @@ void UnlockAllMemory() | |||||
| if (CHECK_MUNLOCKALL()) { | if (CHECK_MUNLOCKALL()) { | ||||
| jack_log("Succeeded in unlocking all memory"); | jack_log("Succeeded in unlocking all memory"); | ||||
| } else { | } else { | ||||
| jack_error("Cannot unlock down memory area (%s)", strerror(errno)); | |||||
| jack_error("Cannot unlock all memory (%s)", strerror(errno)); | |||||
| } | } | ||||
| } | } | ||||