Correct NetJack2 CELT compilation.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4359 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackNetTool.cpp

@@ -277,6 +277,20 @@ namespace Jack
             if (error != CELT_OK)
                 goto error;
 
+    #if HAVE_CELT_API_0_11
+
+            fCeltEncoder[i] = celt_encoder_create_custom(fCeltMode[i], 1, &error);
+            if (error != CELT_OK)
+                goto error;
+            celt_encoder_ctl(fCeltEncoder[i], CELT_SET_COMPLEXITY(1));
+
+            fCeltDecoder[i] = celt_decoder_create_custom(fCeltMode[i], 1, &error);
+            if (error != CELT_OK)
+                goto error;
+            celt_decoder_ctl(fCeltDecoder[i], CELT_SET_COMPLEXITY(1));
+
+    #elif HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
+
             fCeltEncoder[i] = celt_encoder_create(fCeltMode[i], 1, &error);
             if (error != CELT_OK)
                 goto error;
@@ -286,6 +300,20 @@ namespace Jack
             if (error != CELT_OK)
                 goto error;
             celt_decoder_ctl(fCeltDecoder[i], CELT_SET_COMPLEXITY(1));
+
+    #else
+
+            fCeltEncoder[i] = celt_encoder_create(fCeltMode[i]);
+            if (error != CELT_OK)
+                goto error;
+            celt_encoder_ctl(fCeltEncoder[i], CELT_SET_COMPLEXITY(1));
+
+            fCeltDecoder[i] = celt_decoder_create(fCeltMode[i]);
+            if (error != CELT_OK)
+                goto error;
+            celt_decoder_ctl(fCeltDecoder[i], CELT_SET_COMPLEXITY(1));
+
+    #endif
         }
 
         fPortBuffer = new sample_t* [fNPorts];

macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -9497,6 +9497,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DJACK_32_64",
@@ -9566,6 +9567,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DJACK_32_64",
@@ -14341,6 +14343,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-D__SMP__",
@@ -14402,6 +14405,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-D__SMP__",
@@ -16455,6 +16459,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
@@ -16524,6 +16529,7 @@
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
@@ -17194,6 +17200,7 @@
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DMACH_RPC_MACH_SEMA",
 				);
@@ -17245,6 +17252,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
@@ -18896,6 +18904,7 @@
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DMACH_RPC_MACH_SEMA",
 				);
@@ -18949,6 +18958,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = (
+					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DMACH_RPC_MACH_SEMA",
 				);