diff --git a/macosx/config.h b/macosx/config.h index 6319f88..a208680 100755 --- a/macosx/config.h +++ b/macosx/config.h @@ -20,7 +20,7 @@ /* Defined "by hand" on Darwin/MacOSX */ -#define VERSION "0.71.3" +#define VERSION "0.74.2" #define ADDON_DIR "/usr/local/lib" diff --git a/macosx/jack.pbproj/project.pbxproj b/macosx/jack.pbproj/project.pbxproj index 1f84c49..41444da 100755 --- a/macosx/jack.pbproj/project.pbxproj +++ b/macosx/jack.pbproj/project.pbxproj @@ -66,6 +66,7 @@ 4BF8712F040BDE8200053105, 4BA1CB000470D38800053105, 4BA1E4570442D99D00053105, + 4BB3FC31048B7EF000053105, ); }; 08FB7794FE84155DC02AAC07 = { @@ -76,7 +77,6 @@ 4BA716600408E047004F4E3A, 4BA7165F0408DFF5004F4E3A, 08FB7795FE84155DC02AAC07, - C6A0FF2B0290797F04C91782, 1AB674ADFE9D54B511CA2CBB, ); isa = PBXGroup; @@ -90,6 +90,7 @@ 4B813E110406AD4900053105, 4B813E120406AD4900053105, 4BB407B0044DB8EF00053105, + 4BB3416604D5115900053105, ); isa = PBXGroup; name = Client; @@ -131,7 +132,6 @@ 4BA7173304090368004F4E3A, 4BA7173404090369004F4E3A, 4BA7173504090369004F4E3A, - 4BA717360409036A004F4E3A, 4BA717370409036A004F4E3A, 4BA717380409036B004F4E3A, 4BA717390409036C004F4E3A, @@ -145,13 +145,14 @@ 4BA7174104090370004F4E3A, 4BA7174204090371004F4E3A, 4BA7174304090372004F4E3A, - 4B099345041FB67A00053105, 4B6BFD3E042B26F800053105, 4B6BFD42042B274900053105, 4B16FF920467B5A000053105, 4BB9E095046FADED00053105, 4B5B51EE047D353A00053105, 4BAA76A7047E0D5200053105, + 4BA74631048BC86900053105, + 4B783E1B049F824D00053105, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -169,6 +170,7 @@ 4B6BFD46042B4E4D00053105, 4BB407B2044DB8EF00053105, 4B5B51ED047D353A00053105, + 4BB3416204D5113A00053105, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -206,6 +208,7 @@ 4BA1E4580442D99D00053105, 4BA1CADF0470D14500053105, 4BA1CB010470D38800053105, + 4BB3FC32048B7EF000053105, ); isa = PBXGroup; name = Products; @@ -270,24 +273,12 @@ path = fakepoll.h; refType = 4; }; - 4B099345041FB67A00053105 = { - fileRef = 4B099343041FB67A00053105; - isa = PBXBuildFile; - settings = { - }; - }; 4B099348041FB67A00053105 = { fileRef = 4B099342041FB67A00053105; isa = PBXBuildFile; settings = { }; }; - 4B099349041FB67A00053105 = { - fileRef = 4B099343041FB67A00053105; - isa = PBXBuildFile; - settings = { - }; - }; 4B16FF900467B5A000053105 = { fileEncoding = 30; isa = PBXFileReference; @@ -374,6 +365,9 @@ 4BCA2605040B8BC900053105, 4BF87132040BDEAE00053105, 4BA1E44F0442D89100053105, + 4BB3FC36048B7F7C00053105, + 4BB3FC37048B7F7C00053105, + 4BB3FC34048B7F0000053105, ); isa = PBXGroup; name = Samples; @@ -438,6 +432,7 @@ }; 4B6CBA33041F4DDF00053105 = { children = ( + 4BA74630048BC86900053105, 4B6CBA3F041F4F4D00053105, 4B16FF900467B5A000053105, 4B099342041FB67A00053105, @@ -469,6 +464,12 @@ settings = { }; }; + 4B783E1B049F824D00053105 = { + fileRef = 4B099343041FB67A00053105; + isa = PBXBuildFile; + settings = { + }; + }; 4B813E0D0406ACEE00053105 = { fileEncoding = 30; isa = PBXFileReference; @@ -501,10 +502,8 @@ buildActionMask = 2147483647; files = ( 4BA1CAE60470D1FB00053105, - 4BA1CAE80470D1FC00053105, 4BA1CAEA0470D1FD00053105, 4BA1CAEC0470D24100053105, - 4BA1CAED0470D24300053105, 4BA1CAEE0470D24500053105, 4BA1CAEF0470D26000053105, 4B5B51F0047D353A00053105, @@ -530,6 +529,7 @@ 4BA1CAE50470D1FA00053105, 4BA1CAE70470D1FB00053105, 4B5B51EF047D353A00053105, + 4BB3416704D5115900053105, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -563,7 +563,7 @@ HEADER_SEARCH_PATHS = ". /sw/include ../"; LIBRARY_SEARCH_PATHS = /sw/lib; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = ""; + OTHER_CFLAGS = "-DOLD_TRANSPORT"; OTHER_LDFLAGS = "-framework CoreAudio "; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -663,12 +663,6 @@ settings = { }; }; - 4BA1CAE80470D1FC00053105 = { - fileRef = 4B099343041FB67A00053105; - isa = PBXBuildFile; - settings = { - }; - }; 4BA1CAEA0470D1FD00053105 = { fileRef = 4BB9E091046FADED00053105; isa = PBXBuildFile; @@ -684,15 +678,6 @@ ); }; }; - 4BA1CAED0470D24300053105 = { - fileRef = 4BA716740408F4AD004F4E3A; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - Public, - ); - }; - }; 4BA1CAEE0470D24500053105 = { fileRef = 4BA716850408F4AD004F4E3A; isa = PBXBuildFile; @@ -852,6 +837,7 @@ 4B5EA37B0406AB6E00053105, 4B5EA35F0406AB6E00053105, 4B813E0F0406AD3100053105, + 4BB3416004D5113A00053105, ); isa = PBXGroup; name = Server; @@ -887,13 +873,6 @@ path = ../jack/engine.h; refType = 2; }; - 4BA716740408F4AD004F4E3A = { - fileEncoding = 30; - isa = PBXFileReference; - name = error.h; - path = ../jack/error.h; - refType = 2; - }; 4BA716750408F4AD004F4E3A = { fileEncoding = 30; isa = PBXFileReference; @@ -1003,12 +982,6 @@ settings = { }; }; - 4BA717360409036A004F4E3A = { - fileRef = 4BA716740408F4AD004F4E3A; - isa = PBXBuildFile; - settings = { - }; - }; 4BA717370409036A004F4E3A = { fileRef = 4BA716750408F4AD004F4E3A; isa = PBXBuildFile; @@ -1087,12 +1060,23 @@ settings = { }; }; + 4BA74630048BC86900053105 = { + fileEncoding = 30; + isa = PBXFileReference; + path = config.h; + refType = 2; + }; + 4BA74631048BC86900053105 = { + fileRef = 4BA74630048BC86900053105; + isa = PBXBuildFile; + settings = { + }; + }; 4BA9D903040E0CC200053105 = { children = ( 4BA716710408F4AD004F4E3A, 4BA716720408F4AD004F4E3A, 4BA716730408F4AD004F4E3A, - 4BA716740408F4AD004F4E3A, 4BA716750408F4AD004F4E3A, 4BA716770408F4AD004F4E3A, 4BA7167A0408F4AD004F4E3A, @@ -1108,7 +1092,6 @@ 4BA716860408F4AD004F4E3A, 4B6BFD3D042B26F800053105, 4B6BFD41042B274900053105, - 4BD69BCA040A857A00053105, ); isa = PBXGroup; name = Headers; @@ -1126,6 +1109,137 @@ settings = { }; }; + 4BB3416004D5113A00053105 = { + fileEncoding = 30; + isa = PBXFileReference; + name = transengine.c; + path = ../jackd/transengine.c; + refType = 2; + }; + 4BB3416204D5113A00053105 = { + fileRef = 4BB3416004D5113A00053105; + isa = PBXBuildFile; + settings = { + }; + }; + 4BB3416404D5113A00053105 = { + fileRef = 4BB3416004D5113A00053105; + isa = PBXBuildFile; + settings = { + }; + }; + 4BB3416604D5115900053105 = { + fileEncoding = 30; + isa = PBXFileReference; + name = transclient.c; + path = ../libjack/transclient.c; + refType = 2; + }; + 4BB3416704D5115900053105 = { + fileRef = 4BB3416604D5115900053105; + isa = PBXBuildFile; + settings = { + }; + }; + 4BB3FC2D048B7EF000053105 = { + buildActionMask = 2147483647; + files = ( + 4BB3FC38048B7F7C00053105, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4BB3FC2E048B7EF000053105 = { + buildActionMask = 2147483647; + files = ( + 4BB3FC35048B7F0000053105, + 4BB3FC39048B7F7C00053105, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4BB3FC2F048B7EF000053105 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4BB3FC30048B7EF000053105 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4BB3FC31048B7EF000053105 = { + buildPhases = ( + 4BB3FC2D048B7EF000053105, + 4BB3FC2E048B7EF000053105, + 4BB3FC2F048B7EF000053105, + 4BB3FC30048B7EF000053105, + ); + buildSettings = { + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = "-framework Jack -lsndfile"; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = jack_rec; + REZ_EXECUTABLE = YES; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + ); + isa = PBXToolTarget; + name = jack_rec; + productInstallPath = /usr/local/bin; + productName = jack_rec; + productReference = 4BB3FC32048B7EF000053105; + }; + 4BB3FC32048B7EF000053105 = { + isa = PBXExecutableFileReference; + path = jack_rec; + refType = 3; + }; + 4BB3FC34048B7F0000053105 = { + fileEncoding = 30; + isa = PBXFileReference; + name = capture_client.c; + path = "../example-clients/capture_client.c"; + refType = 2; + }; + 4BB3FC35048B7F0000053105 = { + fileRef = 4BB3FC34048B7F0000053105; + isa = PBXBuildFile; + settings = { + }; + }; + 4BB3FC36048B7F7C00053105 = { + fileEncoding = 30; + isa = PBXFileReference; + name = ringbuffer.h; + path = "../example-clients/ringbuffer.h"; + refType = 2; + }; + 4BB3FC37048B7F7C00053105 = { + fileEncoding = 30; + isa = PBXFileReference; + name = ringbuffer.c; + path = "../example-clients/ringbuffer.c"; + refType = 2; + }; + 4BB3FC38048B7F7C00053105 = { + fileRef = 4BB3FC36048B7F7C00053105; + isa = PBXBuildFile; + settings = { + }; + }; + 4BB3FC39048B7F7C00053105 = { + fileRef = 4BB3FC37048B7F7C00053105; + isa = PBXBuildFile; + settings = { + }; + }; 4BB407B0044DB8EF00053105 = { fileEncoding = 30; isa = PBXFileReference; @@ -1192,7 +1306,6 @@ 4BBB872C0406EF300019BE76 = { buildActionMask = 2147483647; files = ( - 4B099349041FB67A00053105, 4B6BFD40042B26F800053105, 4B6BFD44042B274900053105, 4BB9E097046FB05700053105, @@ -1214,6 +1327,7 @@ 4BB407C3044DBEA700053105, 4BB967430474044200053105, 4B5B51EB047D353A00053105, + 4BB3416404D5113A00053105, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1341,12 +1455,6 @@ settings = { }; }; - 4BD69BCA040A857A00053105 = { - fileEncoding = 30; - isa = PBXFileReference; - path = fakepoll.h; - refType = 2; - }; 4BD69BCE040A860400053105 = { fileRef = 4B5EA37B0406AB6E00053105; isa = PBXBuildFile; @@ -1447,35 +1555,15 @@ //C62 //C63 //C64 - C6A0FF2B0290797F04C91782 = { - children = ( - C6A0FF2C0290799A04C91782, - ); - isa = PBXGroup; - name = Documentation; - refType = 4; - }; - C6A0FF2C0290799A04C91782 = { - isa = PBXFileReference; - path = jackd.1; - refType = 4; - }; C6A0FF2D029079AD04C91782 = { buildActionMask = 8; dstPath = /usr/share/man/man1/; dstSubfolderSpec = 0; files = ( - C6A0FF2E029079C004C91782, ); isa = PBXCopyFilesBuildPhase; runOnlyForDeploymentPostprocessing = 1; }; - C6A0FF2E029079C004C91782 = { - fileRef = C6A0FF2C0290799A04C91782; - isa = PBXBuildFile; - settings = { - }; - }; }; rootObject = 08FB7793FE84155DC02AAC07; }