From 47b8ba5bd1ed08d6956013ae646cbef1c5134fa4 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sun, 18 Apr 2010 18:39:17 +0000
Subject: [PATCH] Cleanup JackConstants.h, move platform specific part in
 JackPlatformPlug_os.h by platform.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3987 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                     |  4 ++++
 common/JackConstants.h        | 24 ------------------------
 linux/JackPlatformPlug_os.h   |  4 ++++
 macosx/JackPlatformPlug_os.h  |  4 ++++
 solaris/JackPlatformPlug_os.h |  4 ++++
 windows/JackPlatformPlug_os.h |  4 ++++
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 583d8d5e..4c0ef08f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@ Arnold Krille
   Jackdmp changes log
 ---------------------------
 
+2010-04-016 Stephane Letz  <letz@grame.fr>
+
+	* Make jack_connect/jack_disconnect wait for effective port connection/disconnection.
+
 2010-04-07 Stephane Letz  <letz@grame.fr>
 
 	* Remove call to exit in library code.
diff --git a/common/JackConstants.h b/common/JackConstants.h
index e04906dd..94a7e422 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -59,30 +59,6 @@
 
 #define JACK_DEFAULT_SERVER_NAME "default"
 
-#ifdef WIN32
-#define jack_server_dir "server"
-#define jack_client_dir "client"
-#define ADDON_DIR "jack"
-#endif
-
-#ifdef __APPLE__
-#define jack_server_dir "/tmp"
-#define jack_client_dir "/tmp"
-#define JACK_DEFAULT_DRIVER "coreaudio"
-#endif
-
-#ifdef __linux__
-#define jack_server_dir "/dev/shm"
-#define jack_client_dir "/dev/shm"
-#define JACK_DEFAULT_DRIVER "alsa"
-#endif
-
-#if defined(__sun__) || defined(sun)
-#define jack_server_dir "/tmp"
-#define jack_client_dir "/tmp"
-#define JACK_DEFAULT_DRIVER "oss"
-#endif
-
 #define jack_server_entry "jackdmp_entry"
 #define jack_client_entry "jack_client"
 
diff --git a/linux/JackPlatformPlug_os.h b/linux/JackPlatformPlug_os.h
index c0cd93ba..22750dcc 100644
--- a/linux/JackPlatformPlug_os.h
+++ b/linux/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackPlatformPlug_linux__
 #define __JackPlatformPlug_linux__
 
+#define jack_server_dir "/dev/shm"
+#define jack_client_dir "/dev/shm"
+#define JACK_DEFAULT_DRIVER "alsa"
+
 namespace Jack
 {
     struct JackRequest;
diff --git a/macosx/JackPlatformPlug_os.h b/macosx/JackPlatformPlug_os.h
index c52a259f..6c218d5c 100644
--- a/macosx/JackPlatformPlug_os.h
+++ b/macosx/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackPlatformPlug_APPLE__
 #define __JackPlatformPlug_APPLE__
 
+#define jack_server_dir "/tmp"
+#define jack_client_dir "/tmp"
+#define JACK_DEFAULT_DRIVER "coreaudio"
+
 namespace Jack
 {       
 	class JackPosixMutex;
diff --git a/solaris/JackPlatformPlug_os.h b/solaris/JackPlatformPlug_os.h
index a244010a..e3a03d34 100644
--- a/solaris/JackPlatformPlug_os.h
+++ b/solaris/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackPlatformPlug_sun__
 #define __JackPlatformPlug_sun__
 
+#define jack_server_dir "/tmp"
+#define jack_client_dir "/tmp"
+#define JACK_DEFAULT_DRIVER "oss"
+
 namespace Jack
 {
     struct JackRequest;
diff --git a/windows/JackPlatformPlug_os.h b/windows/JackPlatformPlug_os.h
index 87c2e40f..bbafd0c9 100644
--- a/windows/JackPlatformPlug_os.h
+++ b/windows/JackPlatformPlug_os.h
@@ -21,6 +21,10 @@
 #ifndef __JackPlatformPlug_WIN32__
 #define __JackPlatformPlug_WIN32__
 
+#define jack_server_dir "server"
+#define jack_client_dir "client"
+#define ADDON_DIR "jack"
+
 namespace Jack
 {
     struct JackRequest;
-- 
2.11.4.GIT