diff --git a/ChangeLog b/ChangeLog index 9caa187f..a3722932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Tom Szilagyi * Cleanup old zombification code. * Linux Makefile now install jack headers. * Use of JACK_CLIENT_DEBUG environment variable to activate debug client mode. + * Definition of JACK_LOCATION variable using -D in the Makefile. 2007-10-25 Stephane Letz diff --git a/common/JackConstants.h b/common/JackConstants.h index bc45bfde..e5190107 100644 --- a/common/JackConstants.h +++ b/common/JackConstants.h @@ -54,15 +54,14 @@ namespace Jack #ifdef WIN32 #define jack_server_dir "server" #define jack_client_dir "client" + #define ADDON_DIR "jackmp" #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 @@ -71,7 +70,7 @@ namespace Jack #define ALL_CLIENTS -1 // for notification -#define JACK_PROTOCOL_VERSION 1 +#define JACK_PROTOCOL_VERSION 2 #define DRIVER_OPEN_TIMEOUT 5 // in sec diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp index e0d16137..0b243a32 100644 --- a/common/JackDriverLoader.cpp +++ b/common/JackDriverLoader.cpp @@ -26,11 +26,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "JackError.h" #include -#ifdef WIN32 -#define ADDON_DIR "jackmp" // TO IMPROVE -#else +#ifndef WIN32 #include -//#define ADDON_DIR "/usr/local/lib/jackmp" // TO IMPROVE #endif static void @@ -53,8 +50,7 @@ jack_print_driver_options (jack_driver_desc_t * desc, FILE *file) sprintf (arg_default, "%c", desc->params[i].value.c); break; case JackDriverParamString: - if (desc->params[i].value.str && - strcmp (desc->params[i].value.str, "") != 0) + if (desc->params[i].value.str && strcmp (desc->params[i].value.str, "") != 0) sprintf (arg_default, "%s", desc->params[i].value.str); else sprintf (arg_default, "none"); @@ -77,7 +73,6 @@ jack_print_driver_param_usage (jack_driver_desc_t * desc, unsigned long param, F { fprintf (file, "Usage information for the '%s' parameter for driver '%s':\n", desc->params[param].name, desc->name); - fprintf (file, "%s\n", desc->params[param].long_desc); } @@ -115,7 +110,7 @@ jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSL printf ("Parameters for driver '%s' (all parameters are optional):\n", desc->name); jack_print_driver_options (desc, stdout); return 1; - } + } /* set up the stuff for getopt */ options = (char*)calloc (desc->nparams * 3 + 1, sizeof (char)); @@ -125,7 +120,6 @@ jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSL for (i = 0; i < desc->nparams; i++) { sprintf (options_ptr, "%c::", desc->params[i].character); options_ptr += 3; - long_options[i].name = desc->params[i].name; long_options[i].flag = NULL; long_options[i].val = desc->params[i].character; diff --git a/linux/Makefile b/linux/Makefile index 6730c4b9..9ab145ba 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -48,13 +48,13 @@ objects_linux_freebob := JackFreebobDriver.o objects_linux_dummy := JackDummyDriver.o CFLAGS := -g -fPIC -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS) -CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)\bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) #CFLAGS := -g -fPIC -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS) -#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)\bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) # Use this line to compile with POSIX names semaphore -#CXXFLAGS := -g -O3 -fPIC -DSOCKET_RPC_POSIX_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) +#CXXFLAGS := -g -O3 -fPIC -DSOCKET_RPC_POSIX_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" -DJACK_LOCATION=\"$(prefix)\bin\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) all : $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) \ $(TARGET_LINUX_SERVER) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_DUMMY) \ diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index e3c1848f..708557d5 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -48,9 +48,7 @@ /* Begin PBXBuildFile section */ 4B3F49080AD8503300491C6E /* jack_cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3F49070AD8503300491C6E /* jack_cpu.c */; }; - 4B44FAE60C7598370033A72C /* JackServerLaunch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FAE50C7598370033A72C /* JackServerLaunch.cpp */; }; 4B44FAE70C7598370033A72C /* JackServerLaunch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FAE50C7598370033A72C /* JackServerLaunch.cpp */; }; - 4B44FAE80C7598370033A72C /* JackServerLaunch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FAE50C7598370033A72C /* JackServerLaunch.cpp */; }; 4B5A1BBE0CD1CC110005BF74 /* midiseq.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B5A1BBD0CD1CC110005BF74 /* midiseq.c */; }; 4B5A1BDD0CD1CD420005BF74 /* midisine.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B5A1BDC0CD1CD420005BF74 /* midisine.c */; }; 4B5DB9830CD2429A00EBA5EE /* JackDebugClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B98AE000931D30C0091932A /* JackDebugClient.cpp */; }; @@ -2367,7 +2365,6 @@ buildActionMask = 2147483647; files = ( 4B699BAA097D421600A18468 /* Jackdmp.cpp in Sources */, - 4B44FAE60C7598370033A72C /* JackServerLaunch.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2460,7 +2457,6 @@ 4BD4B4D909BACD9600750C0F /* JackTransportEngine.cpp in Sources */, 4BC216850A444BAD00BDA09F /* JackServerAPI.cpp in Sources */, 4BC216890A444BDE00BDA09F /* JackServerGlobals.cpp in Sources */, - 4B44FAE80C7598370033A72C /* JackServerLaunch.cpp in Sources */, 4BF520540CB8D0E80037470E /* timestamps.c in Sources */, 4BAB95BA0B9E20B800A0C723 /* JackPortType.cpp in Sources */, 4BAB95EE0B9E21A500A0C723 /* JackAudioPort.cpp in Sources */, @@ -3267,7 +3263,9 @@ OTHER_CPLUSPLUSFLAGS = ( "-DMACH_RPC_MACH_SEMA", "-D__SMP__", + "$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)", ); + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -3318,7 +3316,9 @@ OTHER_CPLUSPLUSFLAGS = ( "-DMACH_RPC_MACH_SEMA", "-D__SMP__", + "$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)", ); + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; OTHER_LDFLAGS = ( "-framework", Carbon, @@ -3367,7 +3367,9 @@ OTHER_CPLUSPLUSFLAGS = ( "-DMACH_RPC_MACH_SEMA", "-D__SMP__", + "$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)", ); + OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\""; OTHER_LDFLAGS = ( "-framework", Carbon,