Server and user directory related code moved in a JackTools file.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1683 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -13,6 +13,10 @@ Tom Szilagyi
   Jackdmp changes log
 ---------------------------
 
+2007-10-31 Stephane Letz  <letz@grame.fr>
+
+	* Server and user directory related code moved in a JackTools file.
+
 2007-10-30 Stephane Letz  <letz@grame.fr>
 
 	* Fix a bug in freewheel management in async mode: drivers now receive the kStartFreewheelCallback and kStopFreewheelCallback notifications.

common/JackEngine.cpp

@@ -523,7 +523,7 @@ int JackEngine::ClientInternalOpen(const char* name, int* ref, JackEngineControl
     return 0;
 }
 
-// Used for externall clients
+// Used for external clients
 int JackEngine::ClientExternalClose(int refnum)
 {
     JackClientInterface* client = fClientTable[refnum];

common/JackServerGlobals.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackServerGlobals.h"
 #include "JackError.h"
+#include "JackTools.h"
 #include "shm.h"
 #include <getopt.h>
 
@@ -30,8 +31,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 	#include <dirent.h>
 #endif
 
-#define DEFAULT_TMP_DIR "/tmp"
-static char* jack_tmpdir = DEFAULT_TMP_DIR;
 static char* server_name = NULL;
 
 namespace Jack
@@ -40,106 +39,6 @@ namespace Jack
 long JackServerGlobals::fClientCount = 0;
 JackServer* JackServerGlobals::fServer = NULL;
 
-#ifndef WIN32
-
-static char* jack_default_server_name(void)
-{
-    char* server_name;
-    if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
-        server_name = "default";
-    return server_name;
-}
-
-/* returns the name of the per-user subdirectory of jack_tmpdir */
-static char* jack_user_dir(void)
-{
-    static char user_dir[PATH_MAX] = "";
-
-    /* format the path name on the first call */
-    if (user_dir[0] == '\0') {
-        snprintf(user_dir, sizeof(user_dir), "%s/jack-%d", jack_tmpdir, getuid());
-    }
-
-    return user_dir;
-}
-
-/* returns the name of the per-server subdirectory of jack_user_dir() */
-
-static char* get_jack_server_dir(const char* server_name)
-{
-    static char server_dir[PATH_MAX] = "";
-
-    // format the path name on the first call
-    if (server_dir[0] == '\0') {
-        snprintf(server_dir, sizeof(server_dir), "%s/%s", jack_user_dir(), server_name);
-    }
-
-    return server_dir;
-}
-
-static void
-jack_cleanup_files(const char* server_name)
-{
-    DIR *dir;
-    struct dirent *dirent;
-    char *dir_name = get_jack_server_dir(server_name);
-
-    /* On termination, we remove all files that jackd creates so
-     * subsequent attempts to start jackd will not believe that an
-     * instance is already running.  If the server crashes or is
-     * terminated with SIGKILL, this is not possible.  So, cleanup
-     * is also attempted when jackd starts.
-     *
-     * There are several tricky issues.  First, the previous JACK
-     * server may have run for a different user ID, so its files
-     * may be inaccessible.  This is handled by using a separate
-     * JACK_TMP_DIR subdirectory for each user.  Second, there may
-     * be other servers running with different names.  Each gets
-     * its own subdirectory within the per-user directory.  The
-     * current process has already registered as `server_name', so
-     * we know there is no other server actively using that name.
-     */
-
-    /* nothing to do if the server directory does not exist */
-    if ((dir = opendir(dir_name)) == NULL) {
-        return ;
-    }
-
-    /* unlink all the files in this directory, they are mine */
-    while ((dirent = readdir(dir)) != NULL) {
-
-        char fullpath[PATH_MAX];
-
-        if ((strcmp(dirent->d_name, ".") == 0)
-                || (strcmp(dirent->d_name, "..") == 0)) {
-            continue;
-        }
-
-        snprintf(fullpath, sizeof (fullpath), "%s/%s", dir_name, dirent->d_name);
-
-        if (unlink(fullpath)) {
-            jack_error("cannot unlink `%s' (%s)", fullpath, strerror(errno));
-        }
-    }
-
-    closedir(dir);
-
-    /* now, delete the per-server subdirectory, itself */
-    if (rmdir(dir_name)) {
-        jack_error("cannot remove `%s' (%s)", dir_name,
-                    strerror(errno));
-    }
-
-    /* finally, delete the per-user subdirectory, if empty */
-    if (rmdir (jack_user_dir())) {
-        if (errno != ENOTEMPTY) {
-            jack_error("cannot remove `%s' (%s)",
-                        jack_user_dir(), strerror(errno));
-        }
-    }
-}
-
-#endif
 
 int JackServerGlobals::JackStart(const char* server_name, jack_driver_desc_t* driver_desc, JSList* driver_params, int sync, int temporary, int time_out_ms, int rt, int priority, int loopback, int verbose)
 {
@@ -353,7 +252,7 @@ bool JackServerGlobals::Init()
 
 	#ifndef WIN32
 		if (server_name == NULL)
-			server_name = jack_default_server_name();
+			server_name = JackTools::DefaultServerName();
 	#endif
 
 		rc = jack_register_server(server_name, false);
@@ -375,7 +274,7 @@ bool JackServerGlobals::Init()
 		/* clean up shared memory and files from any previous instance of this server name */
 		jack_cleanup_shm();
 	#ifndef WIN32
-		jack_cleanup_files(server_name);
+		JackTools::CleanupFiles(server_name);
 	#endif
 
 		if (!realtime && client_timeout == 0)
@@ -391,7 +290,7 @@ bool JackServerGlobals::Init()
 			JackDelete();
 			jack_cleanup_shm();
 		#ifndef WIN32
-			jack_cleanup_files(server_name);
+			JackTools::CleanupFiles(server_name);
 		#endif
 			jack_unregister_server(server_name);
 			goto error;
@@ -412,7 +311,7 @@ void JackServerGlobals::Destroy()
 		JackStop();
 		jack_cleanup_shm();
 	#ifndef WIN32
-		jack_cleanup_files(server_name);
+		JackTools::CleanupFiles(server_name);
 	#endif
 		jack_unregister_server(server_name);
     }

common/JackSocket.cpp

@@ -200,9 +200,6 @@ int JackServerSocket::Bind(const char* dir, const char* name, int which) // A re
     JackLog("Bind: addr.sun_path %s\n", addr.sun_path);
     unlink(fName); // Security...
 
-    JackLog("Bind: addr.sun_path %s\n", addr.sun_path);
-    unlink(fName); // Security...
-
     if (bind(fSocket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
         jack_error("Cannot bind server to socket (%s)", strerror(errno));
         goto error;

common/JackTools.cpp

@@ -0,0 +1,143 @@
+/*
+  Copyright (C) 2001 Paul Davis
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+  
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software 
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#include "JackTools.h"
+#include "JackError.h"
+
+namespace Jack
+{
+
+#define DEFAULT_TMP_DIR "/tmp"
+char* jack_tmpdir = DEFAULT_TMP_DIR;
+
+int JackTools::GetPID() 
+{
+#ifdef WIN32
+	return  _getpid();
+#else
+	 return getpid();
+#endif
+}
+
+int JackTools::GetUID() 
+{
+#ifdef WIN32
+	//return  _getpid();
+	#error "No getuid function available"
+#else
+	 return getuid();
+#endif
+}
+
+char* JackTools::DefaultServerName()
+{
+    char* server_name;
+    if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
+        server_name = "default";
+    return server_name;
+}
+
+/* returns the name of the per-user subdirectory of jack_tmpdir */
+char* JackTools::UserDir()
+{
+	static char user_dir[PATH_MAX + 1] = "";
+
+	/* format the path name on the first call */
+	if (user_dir[0] == '\0') {
+		if (getenv ("JACK_PROMISCUOUS_SERVER")) {
+			snprintf(user_dir, sizeof(user_dir), "%s/jack", jack_tmpdir);
+		} else {
+			snprintf(user_dir, sizeof(user_dir), "%s/jack-%d", jack_tmpdir, GetUID());
+		}
+	}
+
+	return user_dir;
+}
+
+/* returns the name of the per-server subdirectory of jack_user_dir() */
+char* JackTools::ServerDir(const char* server_name, char* server_dir)
+{
+	/* format the path name into the suppled server_dir char array,
+	 * assuming that server_dir is at least as large as PATH_MAX+1 */
+
+	snprintf(server_dir, PATH_MAX  + 1, "%s/%s", UserDir(), server_name);
+	return server_dir;
+}
+
+void JackTools::CleanupFiles(const char* server_name)
+{
+    DIR* dir;
+	struct dirent *dirent;
+	char dir_name[PATH_MAX + 1] = "";
+	ServerDir(server_name, dir_name);
+
+	/* On termination, we remove all files that jackd creates so
+	 * subsequent attempts to start jackd will not believe that an
+	 * instance is already running. If the server crashes or is
+	 * terminated with SIGKILL, this is not possible. So, cleanup
+	 * is also attempted when jackd starts.
+	 *
+	 * There are several tricky issues. First, the previous JACK
+	 * server may have run for a different user ID, so its files
+	 * may be inaccessible. This is handled by using a separate
+	 * JACK_TMP_DIR subdirectory for each user. Second, there may
+	 * be other servers running with different names. Each gets
+	 * its own subdirectory within the per-user directory. The
+	 * current process has already registered as `server_name', so
+	 * we know there is no other server actively using that name.
+	 */
+
+	/* nothing to do if the server directory does not exist */
+	if ((dir = opendir(dir_name)) == NULL) {
+		return;
+	}
+
+	/* unlink all the files in this directory, they are mine */
+	while ((dirent = readdir(dir)) != NULL) {
+
+		char fullpath[PATH_MAX + 1];
+
+		if ((strcmp(dirent->d_name, ".") == 0) || (strcmp (dirent->d_name, "..") == 0)) {
+			continue;
+		}
+
+		snprintf(fullpath, sizeof(fullpath), "%s/%s", dir_name, dirent->d_name);
+
+		if (unlink(fullpath)) {
+			jack_error("cannot unlink `%s' (%s)", fullpath, strerror(errno));
+		}
+	} 
+
+	closedir(dir);
+
+	/* now, delete the per-server subdirectory, itself */
+	if (rmdir(dir_name)) {
+ 		jack_error("cannot remove `%s' (%s)", dir_name, strerror(errno));
+	}
+
+	/* finally, delete the per-user subdirectory, if empty */
+	if (rmdir(UserDir())) {
+		if (errno != ENOTEMPTY) {
+			jack_error("cannot remove `%s' (%s)", UserDir(), strerror(errno));
+		}
+	}
+}
+
+
+}

common/JackTools.h

@@ -0,0 +1,47 @@
+/*
+  Copyright (C) 2001 Paul Davis
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+  
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software 
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackTools__
+#define __JackTools__
+
+#ifdef WIN32
+	#include <windows.h>
+#else
+	#include <sys/types.h>
+	#include <unistd.h>
+	#include <dirent.h>
+#endif
+
+namespace Jack
+{
+
+	struct JackTools {
+	
+		static int GetPID();
+		static int GetUID();
+		
+		static char* UserDir();
+		static char* ServerDir(const char* server_name, char* server_dir);
+		static char* DefaultServerName();
+		static void CleanupFiles(const char* server_name);
+
+	};
+}
+
+#endif

common/Jackdmp.cpp

@@ -33,6 +33,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackDriverLoader.h"
 #include "jslist.h"
 #include "JackError.h"
+#include "JackTools.h"
 #include "shm.h"
 #include "jack.h"
 
@@ -49,12 +50,8 @@ static int temporary = 0;
 static int client_timeout = 0; /* msecs; if zero, use period size. */
 static int do_unlock = 0;
 static JSList* drivers = NULL;
-
 static sigset_t signals;
 
-#define DEFAULT_TMP_DIR "/tmp"
-char* jack_tmpdir = DEFAULT_TMP_DIR;
-
 static void silent_jack_error_callback(const char *desc)
 {}
 
@@ -137,107 +134,6 @@ static void FilterSIGPIPE()
     pthread_sigmask(SIG_BLOCK, &set, 0);
 }
 
-static char* jack_default_server_name(void)
-{
-    char* server_name;
-    if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
-        server_name = "default";
-    return server_name;
-}
-
-/* returns the name of the per-user subdirectory of jack_tmpdir */
-static char* jack_user_dir(void)
-{
-    static char user_dir[PATH_MAX] = "";
-
-    /* format the path name on the first call */
-    if (user_dir[0] == '\0') {
-        snprintf(user_dir, sizeof(user_dir), "%s/jack-%d",
-                  jack_tmpdir, getuid());
-    }
-
-    return user_dir;
-}
-
-/* returns the name of the per-server subdirectory of jack_user_dir() */
-
-static char* get_jack_server_dir(const char* toto)
-{
-    static char server_dir[PATH_MAX] = "";
-
-    // format the path name on the first call
-    if (server_dir[0] == '\0') {
-        snprintf(server_dir, sizeof(server_dir), "%s/%s",
-                  jack_user_dir(), server_name);
-    }
-
-    return server_dir;
-}
-
-static void
-jack_cleanup_files(const char *server_name)
-{
-    DIR *dir;
-    struct dirent *dirent;
-    char *dir_name = get_jack_server_dir(server_name);
-
-    /* On termination, we remove all files that jackd creates so
-     * subsequent attempts to start jackd will not believe that an
-     * instance is already running.  If the server crashes or is
-     * terminated with SIGKILL, this is not possible.  So, cleanup
-     * is also attempted when jackd starts.
-     *
-     * There are several tricky issues.  First, the previous JACK
-     * server may have run for a different user ID, so its files
-     * may be inaccessible.  This is handled by using a separate
-     * JACK_TMP_DIR subdirectory for each user.  Second, there may
-     * be other servers running with different names.  Each gets
-     * its own subdirectory within the per-user directory.  The
-     * current process has already registered as `server_name', so
-     * we know there is no other server actively using that name.
-     */
-
-    /* nothing to do if the server directory does not exist */
-    if ((dir = opendir(dir_name)) == NULL) {
-        return ;
-    }
-
-    /* unlink all the files in this directory, they are mine */
-    while ((dirent = readdir(dir)) != NULL) {
-
-        char fullpath[PATH_MAX];
-
-        if ((strcmp(dirent->d_name, ".") == 0)
-                || (strcmp(dirent->d_name, "..") == 0)) {
-            continue;
-        }
-
-        snprintf(fullpath, sizeof(fullpath), "%s/%s",
-                  dir_name, dirent->d_name);
-
-        if (unlink(fullpath)) {
-            jack_error("cannot unlink `%s' (%s)", fullpath,
-                        strerror(errno));
-        }
-    }
-
-    closedir(dir);
-
-    /* now, delete the per-server subdirectory, itself */
-    if (rmdir(dir_name)) {
-        jack_error("cannot remove `%s' (%s)", dir_name,
-                    strerror(errno));
-    }
-
-    /* finally, delete the per-user subdirectory, if empty */
-    if (rmdir(jack_user_dir())) {
-        if (errno != ENOTEMPTY) {
-            jack_error("cannot remove `%s' (%s)",
-                        jack_user_dir(), strerror(errno));
-        }
-    }
-}
-
 int main(int argc, char* argv[])
 {
     int sig;
@@ -407,7 +303,7 @@ int main(int argc, char* argv[])
     }
 
     if (server_name == NULL)
-        server_name = jack_default_server_name();
+        server_name = JackTools::DefaultServerName();
 
     copyright(stdout);
 
@@ -430,7 +326,7 @@ int main(int argc, char* argv[])
     /* clean up shared memory and files from any previous
      * instance of this server name */
     jack_cleanup_shm();
-    jack_cleanup_files(server_name);
+    JackTools::CleanupFiles(server_name);
 
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
 
@@ -518,7 +414,7 @@ int main(int argc, char* argv[])
 	JackStop();
 
     jack_cleanup_shm();
-    jack_cleanup_files(server_name);
+    JackTools::CleanupFiles(server_name);
     jack_unregister_server(server_name);
 
     return 1;

macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -291,6 +291,10 @@
 		4BD6240D0CBCF16600DE782F /* inprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BD6240C0CBCF16600DE782F /* inprocess.c */; };
 		4BE3225A0CC611EF00AFA640 /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6C737F0CC60A6D001AFFD4 /* types.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BE3225B0CC611F500AFA640 /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6C737F0CC60A6D001AFFD4 /* types.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4BE4CC010CDA153400CCF5BB /* JackTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */; };
+		4BE4CC020CDA153500CCF5BB /* JackTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE4CC000CDA153400CCF5BB /* JackTools.h */; };
+		4BE4CC030CDA153500CCF5BB /* JackTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */; };
+		4BE4CC040CDA153500CCF5BB /* JackTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE4CC000CDA153400CCF5BB /* JackTools.h */; };
 		4BE50F960B01EEC400C05E63 /* JackAPIWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE50F650B01E96200C05E63 /* JackAPIWrapper.cpp */; };
 		4BE6C6AD0A3E0A65005A203A /* jack_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6C6AC0A3E0A65005A203A /* jack_test.cpp */; };
 		4BF520530CB8D0E80037470E /* timestamps.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF520520CB8D0E80037470E /* timestamps.c */; };
@@ -597,6 +601,8 @@
 		4BD561C708EEB910006BBC2A /* JackSynchro.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSynchro.h; path = ../common/JackSynchro.h; sourceTree = SOURCE_ROOT; };
 		4BD623F70CBCF0F000DE782F /* inprocess.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = inprocess.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BD6240C0CBCF16600DE782F /* inprocess.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = inprocess.c; path = "../example-clients/inprocess.c"; sourceTree = SOURCE_ROOT; };
+		4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackTools.cpp; path = ../common/JackTools.cpp; sourceTree = SOURCE_ROOT; };
+		4BE4CC000CDA153400CCF5BB /* JackTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackTools.h; path = ../common/JackTools.h; sourceTree = SOURCE_ROOT; };
 		4BE50F650B01E96200C05E63 /* JackAPIWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAPIWrapper.cpp; path = ../common/JackAPIWrapper.cpp; sourceTree = SOURCE_ROOT; };
 		4BE50F8E0B01EE8000C05E63 /* Jackwrapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackwrapper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BE50F8F0B01EE8000C05E63 /* Jackwrapper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Jackwrapper-Info.plist"; sourceTree = "<group>"; };
@@ -1050,6 +1056,8 @@
 			isa = PBXGroup;
 			children = (
 				4B6C73780CC60A6D001AFFD4 /* jack */,
+				4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */,
+				4BE4CC000CDA153400CCF5BB /* JackTools.h */,
 				4B66A8580934964500A89560 /* JackConstants.h */,
 				4BFB73F608AD291A00DB99B8 /* JackGlobals.h */,
 				4B2C28F908DAD01E00249230 /* JackGlobals.cpp */,
@@ -1371,6 +1379,7 @@
 				4BAB95B90B9E20B800A0C723 /* JackPortType.h in Headers */,
 				4B80D7E80BA0D17400F035BB /* JackMidiPort.h in Headers */,
 				4B6B9EF60CD095930051EE5A /* midiport.h in Headers */,
+				4BE4CC020CDA153500CCF5BB /* JackTools.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1436,6 +1445,7 @@
 				4B80D7EB0BA0D17400F035BB /* JackMidiPort.h in Headers */,
 				4B6B9EF70CD095970051EE5A /* midiport.h in Headers */,
 				4B5DB9840CD2429B00EBA5EE /* JackDebugClient.h in Headers */,
+				4BE4CC040CDA153500CCF5BB /* JackTools.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2402,6 +2412,7 @@
 				4B80D7E90BA0D17400F035BB /* JackMidiPort.cpp in Sources */,
 				4B80D7EA0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */,
 				4B6F7AED0CD0CDBD00F48A9D /* JackEngineControl.cpp in Sources */,
+				4BE4CC010CDA153400CCF5BB /* JackTools.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2458,6 +2469,7 @@
 				4B80D7ED0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */,
 				4B6F7AEE0CD0CDBD00F48A9D /* JackEngineControl.cpp in Sources */,
 				4B5DB9830CD2429A00EBA5EE /* JackDebugClient.cpp in Sources */,
+				4BE4CC030CDA153500CCF5BB /* JackTools.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2833,7 +2845,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midiseq;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -2865,7 +2877,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midiseq;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -2895,7 +2907,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midiseq;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -2929,7 +2941,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midisine;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -2961,7 +2973,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midisine;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -2991,7 +3003,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_midisine;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3104,7 +3116,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jackdmp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3158,7 +3170,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jackdmp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3210,7 +3222,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jackdmp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3271,7 +3283,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 				ZERO_LINK = YES;
@@ -3324,7 +3336,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 				ZERO_LINK = NO;
@@ -3375,7 +3387,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 			};
@@ -3435,7 +3447,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackdmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 				ZERO_LINK = YES;
@@ -3491,7 +3503,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackdmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 				ZERO_LINK = NO;
@@ -3545,7 +3557,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Jackdmp;
 				REZ_EXECUTABLE = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost";
 			};
@@ -3575,7 +3587,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3607,7 +3619,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3637,7 +3649,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3669,7 +3681,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_lsp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3699,7 +3711,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_lsp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3727,7 +3739,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_lsp;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3758,7 +3770,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_connect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				SYMROOT = build;
 				WARNING_CFLAGS = (
@@ -3788,7 +3800,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_connect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				SYMROOT = build;
 				WARNING_CFLAGS = (
@@ -3816,7 +3828,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_connect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				SYMROOT = build;
 				WARNING_CFLAGS = (
@@ -3848,7 +3860,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_disconnect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3877,7 +3889,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_disconnect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3904,7 +3916,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_disconnect;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3937,7 +3949,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_freewheel;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3968,7 +3980,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_freewheel;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -3997,7 +4009,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_freewheel;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4032,7 +4044,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_external_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4065,7 +4077,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_external_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4096,7 +4108,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_external_metro;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4131,7 +4143,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testAtomic;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4165,7 +4177,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testAtomic;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4197,7 +4209,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testAtomic;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4229,7 +4241,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testSem;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4260,7 +4272,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testSem;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4289,7 +4301,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = testSem;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4321,7 +4333,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = zombie;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4351,7 +4363,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = zombie;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4379,7 +4391,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = zombie;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4415,7 +4427,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServer;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4449,7 +4461,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServer;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4481,7 +4493,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServer;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4517,7 +4529,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4551,7 +4563,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4583,7 +4595,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4619,7 +4631,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServerClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4653,7 +4665,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServerClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4685,7 +4697,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = synchroServerClient;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4734,7 +4746,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_coreaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4780,7 +4792,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_coreaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4824,7 +4836,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_coreaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4871,7 +4883,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_dummy;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4915,7 +4927,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_dummy;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -4957,7 +4969,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_dummy;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5026,7 +5038,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_portaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5074,7 +5086,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_portaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5120,7 +5132,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = jack_portaudio;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5151,7 +5163,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_load;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5181,7 +5193,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_load;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5209,7 +5221,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_load;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5240,7 +5252,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_unload;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5270,7 +5282,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_unload;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5298,7 +5310,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_unload;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5348,7 +5360,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = inprocess;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5395,7 +5407,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = inprocess;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5440,7 +5452,7 @@
 				OTHER_REZFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = inprocess;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5480,7 +5492,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Jackwrapper;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				ZERO_LINK = YES;
 			};
 			name = Development;
@@ -5513,7 +5525,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Jackwrapper;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				ZERO_LINK = NO;
 			};
 			name = Deployment;
@@ -5544,7 +5556,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Jackwrapper;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				ZERO_LINK = YES;
 			};
 			name = Default;
@@ -5570,7 +5582,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_test;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5600,7 +5612,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_test;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5628,7 +5640,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_test;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5659,7 +5671,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_cpu;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5689,7 +5701,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_cpu;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5717,7 +5729,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jack_cpu;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5749,7 +5761,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jdelay;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5779,7 +5791,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jdelay;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -5807,7 +5819,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = jdelay;
 				REZ_EXECUTABLE = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk/;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",

tests/jack_test.cpp

@@ -1561,7 +1561,7 @@ int main (int argc, char *argv[])
         jack_connect(client1, jack_port_name(output_port1), jack_port_name(input_port2));
         jack_connect(client1, outports[0], jack_port_name(input_port1));
         jack_connect(client2, jack_port_name(output_port2), inports[0]);
-        jack_port_set_latency (output_port2, 256);
+        jack_port_set_latency(output_port2, 256);
         jack_recompute_total_latencies(client1);
 
         if ((jack_port_get_latency (output_port1) != 0) ||
@@ -1577,12 +1577,12 @@ int main (int argc, char *argv[])
             printf("!!! WARNING !!! get_latency functions may have a problem : bad value returned !\n");
             printf("!!! get_latency(output_port1) : %i (must be 0)\n", jack_port_get_latency (output_port1) );
             printf("!!! get_total_latency(output_port1) : %i (must be 0)\n", jack_port_get_total_latency(client1, output_port1));
-            printf("!!! get_latency(PHY[0]) : %i (must be external latency : %i)\n", jack_port_get_latency (jack_port_by_name(client1, inports[0])), ext_latency);
+            printf("!!! get_latency(PHY[0]) : %i (must be external latency : %i)\n", jack_port_get_latency(jack_port_by_name(client1, inports[0])), ext_latency);
             printf("!!! get_total_latency(PHY[0]) : %i (must be %i)\n", jack_port_get_total_latency(client1, jack_port_by_name(client1, inports[0])) , (ext_latency + 256));
             printf("!!! get_total_latency(output_port2) : %i (must be %i)\n", jack_port_get_total_latency(client1, output_port2), (ext_latency + 256));
             printf("!!! get_total_latency(input_port2) : %i (must be 0)\n", jack_port_get_total_latency(client1, input_port2));
             printf("!!! get_total_latency(input_port1) : %i (must be %i)\n", jack_port_get_total_latency(client1, input_port1), ext_latency);
-            printf("!!! get_latency(PHY[0]) : %i (must be %i)\n", jack_port_get_latency (jack_port_by_name(client1, outports[0])), ext_latency);
+            printf("!!! get_latency(PHY[0]) : %i (must be %i)\n", jack_port_get_latency(jack_port_by_name(client1, outports[0])), ext_latency);
             printf("!!! get_total_latency(PHY[0]) : %i (must be %i)\n", jack_port_get_total_latency(client1, jack_port_by_name(client1, outports[0])), ext_latency);
 
         } else {
@@ -1594,10 +1594,10 @@ int main (int argc, char *argv[])
         jack_port_disconnect(client1, input_port1);
         jack_port_disconnect(client1, input_port2);
         Log("Checking a parallel model with 2 clients...\n");
-        jack_connect(client2, outports[0], jack_port_name(input_port1) );
-        jack_connect(client2, outports[0], jack_port_name(input_port2) );
-        jack_connect(client2, jack_port_name(output_port1), inports[0] );
-        jack_connect(client2, jack_port_name(output_port2), inports[0] );
+        jack_connect(client2, outports[0], jack_port_name(input_port1));
+        jack_connect(client2, outports[0], jack_port_name(input_port2));
+        jack_connect(client2, jack_port_name(output_port1), inports[0]);
+        jack_connect(client2, jack_port_name(output_port2), inports[0]);
         jack_port_set_latency (output_port1, 256);
         jack_port_set_latency (output_port2, 512);
         jack_recompute_total_latencies(client1);