diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 2e2c160a..b950f913 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -58,6 +58,7 @@ 4B699DB6097D421700A18468 /* PBXTargetDependency */, 4B699DB8097D421700A18468 /* PBXTargetDependency */, 4B699DBA097D421700A18468 /* PBXTargetDependency */, + 4BF339280F8B87800080FB5B /* PBXTargetDependency */, 4B699DBC097D421700A18468 /* PBXTargetDependency */, BA222AF20DC883F3001A17F4 /* PBXTargetDependency */, 4BD624D30CBCF55700DE782F /* PBXTargetDependency */, @@ -576,6 +577,16 @@ 4BF284190F31B4BC00B05BE3 /* JackArgParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */; }; 4BF2841A0F31B4BC00B05BE3 /* JackArgParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */; }; 4BF2841B0F31B4BC00B05BE3 /* JackArgParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */; }; + 4BF339160F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */; }; + 4BF339170F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF339150F8B86DC0080FB5B /* JackCoreMidiDriver.cpp */; }; + 4BF339180F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */; }; + 4BF339190F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF339150F8B86DC0080FB5B /* JackCoreMidiDriver.cpp */; }; + 4BF3391A0F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */; }; + 4BF3391B0F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF339150F8B86DC0080FB5B /* JackCoreMidiDriver.cpp */; }; + 4BF339210F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */; }; + 4BF339220F8B873E0080FB5B /* JackMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339200F8B873E0080FB5B /* JackMidiDriver.h */; }; + 4BF339230F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */; }; + 4BF339240F8B873E0080FB5B /* JackMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339200F8B873E0080FB5B /* JackMidiDriver.h */; }; 4BF4BAB10E3480AB00403CDF /* JackAudioAdapterFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4BAB00E3480AB00403CDF /* JackAudioAdapterFactory.cpp */; }; 4BF520530CB8D0E80037470E /* timestamps.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF520520CB8D0E80037470E /* timestamps.c */; }; 4BF520540CB8D0E80037470E /* timestamps.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF520520CB8D0E80037470E /* timestamps.c */; }; @@ -963,6 +974,13 @@ remoteGlobalIDString = 4BE99D260AD7A04800C59091; remoteInfo = "jack_cpu Universal"; }; + 4BF339270F8B87800080FB5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 4BF339020F8B864B0080FB5B; + remoteInfo = jack_coremidi; + }; 4BFA83310DF6AB540087B4E1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -1345,6 +1363,11 @@ 4BECB2F40F4451C10091B70A /* JackProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackProcessSync.h; path = ../posix/JackProcessSync.h; sourceTree = SOURCE_ROOT; }; 4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackArgParser.cpp; path = ../common/JackArgParser.cpp; sourceTree = SOURCE_ROOT; }; 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackArgParser.h; path = ../common/JackArgParser.h; sourceTree = SOURCE_ROOT; }; + 4BF3390C0F8B864B0080FB5B /* jack_coremidi.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_coremidi.so; sourceTree = BUILT_PRODUCTS_DIR; }; + 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiDriver.h; path = coremidi/JackCoreMidiDriver.h; sourceTree = SOURCE_ROOT; }; + 4BF339150F8B86DC0080FB5B /* JackCoreMidiDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiDriver.cpp; path = coremidi/JackCoreMidiDriver.cpp; sourceTree = SOURCE_ROOT; }; + 4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackMidiDriver.cpp; path = ../common/JackMidiDriver.cpp; sourceTree = SOURCE_ROOT; }; + 4BF339200F8B873E0080FB5B /* JackMidiDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackMidiDriver.h; path = ../common/JackMidiDriver.h; sourceTree = SOURCE_ROOT; }; 4BF3937C0626BF3600CC67FA /* JackMacLibClientRPC.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMacLibClientRPC.cpp; sourceTree = SOURCE_ROOT; }; 4BF4BAB00E3480AB00403CDF /* JackAudioAdapterFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterFactory.cpp; path = ../common/JackAudioAdapterFactory.cpp; sourceTree = SOURCE_ROOT; }; 4BF520520CB8D0E80037470E /* timestamps.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = timestamps.c; path = ../common/timestamps.c; sourceTree = SOURCE_ROOT; }; @@ -1899,6 +1922,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 4BF339070F8B864B0080FB5B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BFA5E910DEC4D9C00FA4CDB /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2094,6 +2124,7 @@ 4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */, 4B19B3000E23620F00DD4A82 /* audioadapter.so */, 4B5E08D50E5B66EE00BEE4E0 /* netadapter.so */, + 4BF3390C0F8B864B0080FB5B /* jack_coremidi.so */, ); name = Products; sourceTree = ""; @@ -2389,7 +2420,6 @@ 4BA550F605E241B800569492 /* Driver */ = { isa = PBXGroup; children = ( - 4B19B3010E23629800DD4A82 /* Adapter */, 4B869B3D08C8D21C001CF041 /* driver_interface.h */, 4B869B4208C8D22F001CF041 /* JackDriverLoader.h */, 4B869D7F08C9CB00001CF041 /* JackDriverLoader.cpp */, @@ -2399,6 +2429,8 @@ 4BF70ACA0908EE95008B75AD /* JackLoopbackDriver.cpp */, 4BC3988A08B3CF6C00B6F371 /* JackDummyDriver.h */, 4BC3988908B3CF6C00B6F371 /* JackDummyDriver.cpp */, + 4BF3390D0F8B86AF0080FB5B /* MIDI */, + 4B19B3010E23629800DD4A82 /* Adapter */, BA222AEA0DC88379001A17F4 /* Net */, 4BD56D8707968982006D44F9 /* Threaded */, 4BD56D8607968979006D44F9 /* Audio */, @@ -2539,6 +2571,17 @@ name = Threaded; sourceTree = ""; }; + 4BF3390D0F8B86AF0080FB5B /* MIDI */ = { + isa = PBXGroup; + children = ( + 4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */, + 4BF339200F8B873E0080FB5B /* JackMidiDriver.h */, + 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */, + 4BF339150F8B86DC0080FB5B /* JackCoreMidiDriver.cpp */, + ); + name = MIDI; + sourceTree = ""; + }; 4BFB299808AF451200D450D4 /* Mach */ = { isa = PBXGroup; children = ( @@ -2684,6 +2727,7 @@ 4B4F9C910DC20C0400706CB0 /* JackMessageBuffer.h in Headers */, 4B93F19E0E87998400E4ECCD /* JackPosixThread.h in Headers */, 4BECB2FA0F4451C10091B70A /* JackProcessSync.h in Headers */, + 4BF339160F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2748,6 +2792,8 @@ 4B93F19A0E87992200E4ECCD /* JackPosixThread.h in Headers */, 4BBAE4120F42FA6100B8BD3F /* JackEngineProfiling.h in Headers */, 4BECB2FC0F4451C10091B70A /* JackProcessSync.h in Headers */, + 4BF339180F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */, + 4BF339220F8B873E0080FB5B /* JackMidiDriver.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3116,6 +3162,7 @@ 4BF2841B0F31B4BC00B05BE3 /* JackArgParser.h in Headers */, 4BBAE4100F42FA6100B8BD3F /* JackEngineProfiling.h in Headers */, 4BECB2F60F4451C10091B70A /* JackProcessSync.h in Headers */, + 4BF339240F8B873E0080FB5B /* JackMidiDriver.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3270,6 +3317,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 4BF339030F8B864B0080FB5B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 4BF3391A0F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BFA5E8C0DEC4D9C00FA4CDB /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -4529,6 +4584,23 @@ productReference = 4BE99D300AD7A04800C59091 /* jack_cpu */; productType = "com.apple.product-type.tool"; }; + 4BF339020F8B864B0080FB5B /* jack_coremidi Universal */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4BF339080F8B864B0080FB5B /* Build configuration list for PBXNativeTarget "jack_coremidi Universal" */; + buildPhases = ( + 4BF339030F8B864B0080FB5B /* Headers */, + 4BF339050F8B864B0080FB5B /* Sources */, + 4BF339070F8B864B0080FB5B /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "jack_coremidi Universal"; + productName = jack_coreaudio; + productReference = 4BF3390C0F8B864B0080FB5B /* jack_coremidi.so */; + productType = "com.apple.product-type.library.dynamic"; + }; 4BFA5E8B0DEC4D9C00FA4CDB /* testMutex Universal */ = { isa = PBXNativeTarget; buildConfigurationList = 4BFA5E940DEC4D9C00FA4CDB /* Build configuration list for PBXNativeTarget "testMutex Universal" */; @@ -4763,6 +4835,7 @@ 4B699D7F097D421700A18468 /* synchroServerClient Universal */, 4B699D97097D421700A18468 /* jack_coreaudio Universal */, 4B978DB10A31CF4A009E2DD1 /* jack_portaudio Universal */, + 4BF339020F8B864B0080FB5B /* jack_coremidi Universal */, 4B699DA6097D421700A18468 /* jack_dummy Universal */, BA222AC50DC88132001A17F4 /* jack_net Universal */, 4BD623ED0CBCF0F000DE782F /* inprocess */, @@ -5343,6 +5416,7 @@ 4B93F19D0E87998400E4ECCD /* JackPosixThread.cpp in Sources */, 4B93F1C00E87A35400E4ECCD /* JackMachTime.c in Sources */, 4BECB2F90F4451C10091B70A /* JackProcessSync.cpp in Sources */, + 4BF339170F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5399,6 +5473,8 @@ 4B93F22B0E87A72500E4ECCD /* JackMachTime.c in Sources */, 4BBAE4130F42FA6100B8BD3F /* JackEngineProfiling.cpp in Sources */, 4BECB2FB0F4451C10091B70A /* JackProcessSync.cpp in Sources */, + 4BF339190F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */, + 4BF339210F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5778,6 +5854,7 @@ 4BF2841A0F31B4BC00B05BE3 /* JackArgParser.cpp in Sources */, 4BBAE4110F42FA6100B8BD3F /* JackEngineProfiling.cpp in Sources */, 4BECB2F50F4451C10091B70A /* JackProcessSync.cpp in Sources */, + 4BF339230F8B873E0080FB5B /* JackMidiDriver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5949,6 +6026,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 4BF339050F8B864B0080FB5B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4BF3391B0F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BFA5E8D0DEC4D9C00FA4CDB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6293,6 +6378,11 @@ target = 4BE99D260AD7A04800C59091 /* jack_cpu Universal */; targetProxy = 4BE99D620AD7A19100C59091 /* PBXContainerItemProxy */; }; + 4BF339280F8B87800080FB5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 4BF339020F8B864B0080FB5B /* jack_coremidi Universal */; + targetProxy = 4BF339270F8B87800080FB5B /* PBXContainerItemProxy */; + }; 4BFA83320DF6AB540087B4E1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */; @@ -13852,6 +13942,153 @@ }; name = Default; }; + 4BF339090F8B864B0080FB5B /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + i386, + ppc, + ); + COPY_PHASE_STRIP = NO; + DEBUGGING_SYMBOLS = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + EXECUTABLE_EXTENSION = so; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ""; + HEADER_SEARCH_PATHS = ( + ., + ../common/jack, + ../posix, + ../common, + ); + INSTALL_PATH = /usr/local/lib; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA"; + OTHER_LDFLAGS = ( + "-framework", + Jackservermp, + "-framework", + CoreMIDI, + "-framework", + CoreServices, + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = jack_coremidi; + SDKROOT = ""; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + ZERO_LINK = YES; + }; + name = Development; + }; + 4BF3390A0F8B864B0080FB5B /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + i386, + ppc, + ); + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + EXECUTABLE_EXTENSION = so; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PREPROCESSOR_DEFINITIONS = ""; + HEADER_SEARCH_PATHS = ( + ., + ../common/jack, + ../posix, + ../common, + ); + INSTALL_PATH = /usr/local/lib; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA"; + OTHER_LDFLAGS = ( + "-framework", + Jackservermp, + "-framework", + CoreMIDI, + "-framework", + CoreServices, + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = jack_coremidi; + SDKROOT = ""; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + ZERO_LINK = NO; + }; + name = Deployment; + }; + 4BF3390B0F8B864B0080FB5B /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + i386, + ppc, + ); + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + EXECUTABLE_EXTENSION = so; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PREPROCESSOR_DEFINITIONS = ""; + HEADER_SEARCH_PATHS = ../common; + INSTALL_PATH = /usr/local/lib; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA"; + OTHER_LDFLAGS = ( + "-framework", + Jackdmp, + "-framework", + AudioToolBox, + "-framework", + CoreAudio, + "-framework", + CoreServices, + "-framework", + AudioUnit, + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = jack_coreaudio; + SDKROOT = ""; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Default; + }; 4BFA5E950DEC4D9C00FA4CDB /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -15635,6 +15872,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Default; }; + 4BF339080F8B864B0080FB5B /* Build configuration list for PBXNativeTarget "jack_coremidi Universal" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4BF339090F8B864B0080FB5B /* Development */, + 4BF3390A0F8B864B0080FB5B /* Deployment */, + 4BF3390B0F8B864B0080FB5B /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; 4BFA5E940DEC4D9C00FA4CDB /* Build configuration list for PBXNativeTarget "testMutex Universal" */ = { isa = XCConfigurationList; buildConfigurations = (