Commit 6d7314ba authored by sletz's avatar sletz
Browse files

Fix CELT compilation.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4345 0c269be4-1314-0410-8aa9-9f06e86f4224
parent cd307385
......@@ -258,14 +258,14 @@ namespace Jack
break;
case JackCeltEncoder:
#ifdef CELT
#ifdef HAVE_CELT
fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fTxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioCaptureBuffer);
assert(fNetAudioCaptureBuffer);
}
if (fParams.fReturnAudioChannels) {
......@@ -280,14 +280,14 @@ namespace Jack
break;
case JackCeltEncoder:
#ifdef CELT
#ifdef HAVE_CELT
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fRxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioPlaybackBuffer);
assert(fNetAudioPlaybackBuffer);
}
} catch (exception&) {
jack_error("NetAudioBuffer allocation error...");
......@@ -800,14 +800,14 @@ namespace Jack
break;
case JackCeltEncoder:
#ifdef CELT
#ifdef HAVE_CELT
fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioCaptureBuffer);
assert(fNetAudioCaptureBuffer);
}
if (fParams.fReturnAudioChannels) {
......@@ -822,14 +822,14 @@ namespace Jack
break;
case JackCeltEncoder:
#ifdef CELT
#ifdef HAVE_CELT
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioPlaybackBuffer);
assert(fNetAudioPlaybackBuffer);
}
} catch (exception&) {
jack_error("NetAudioBuffer allocation error...");
......
......@@ -249,7 +249,7 @@ namespace Jack
// Celt audio buffer *********************************************************************************
#ifdef CELT
#ifdef HAVE_CELT
#define KPS 32
#define KPS_DIV 8
......@@ -729,6 +729,7 @@ namespace Jack
break;
case (JackCeltEncoder):
jack_info ( "SampleEncoder : %s", "CELT");
jack_info ( "kBits : %d", params->fKBps);
break;
};
jack_info ( "Slave mode : %s", ( params->fSlaveSyncMode ) ? "sync" : "async" );
......
......@@ -558,7 +558,7 @@ namespace Jack
int RenderToNetwork (int subcycle, size_t total_size );
};
#ifdef CELT
#ifdef HAVE_CELT
#include <celt/celt.h>
......
......@@ -9497,7 +9497,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-DJACK_32_64",
"-D__SMP__",
......@@ -9566,7 +9566,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-DJACK_32_64",
"-D__SMP__",
......@@ -14335,7 +14335,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -14396,6 +14396,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -16448,7 +16449,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DHAVE_CELT",
"-DJACK_MONITOR",
"-DSERVER_SIDE",
"-DJACK_32_64",
......@@ -16517,7 +16518,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DHAVE_CELT",
"-DJACK_MONITOR",
"-DSERVER_SIDE",
"-DJACK_32_64",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment