From a2487f38f0bf4d9d429b1fee528a1816c7a80891 Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 6 Sep 2007 09:11:04 +0000 Subject: [PATCH] Cleanup git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1547 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackConstants.h | 4 ++++ common/JackServerLaunch.cpp | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/JackConstants.h b/common/JackConstants.h index 49366b15..fa3b68f8 100644 --- a/common/JackConstants.h +++ b/common/JackConstants.h @@ -51,9 +51,13 @@ #elif __APPLE__ #define jack_server_dir "/tmp" #define jack_client_dir "/tmp" + #define JACK_LOCATION "/usr/local/bin" + #define JACK_DEFAULT_DRIVER "coreaudio" #else #define jack_server_dir "/dev/shm" #define jack_client_dir "/dev/shm" + #define JACK_LOCATION "/usr/local/bin" + #define JACK_DEFAULT_DRIVER "alsa" #endif #define jack_server_entry "jackdmp_entry" diff --git a/common/JackServerLaunch.cpp b/common/JackServerLaunch.cpp index 6602cdd2..5e85f1c9 100644 --- a/common/JackServerLaunch.cpp +++ b/common/JackServerLaunch.cpp @@ -26,16 +26,6 @@ using namespace Jack; #ifndef WIN32 -#ifdef __APPLE__ -#define JACK_LOCATION "/usr/local/bin" -#define JACK_DEFAULT_DRIVER "coreaudio" -#endif - -#ifdef __linux__ -#define JACK_LOCATION "/usr/local/bin" -#define JACK_DEFAULT_DRIVER "alsa" -#endif - /* Exec the JACK server in this process. Does not return. */ static void start_server_aux(const char* server_name) {