Commit cd307385 authored by sletz's avatar sletz
Browse files

Fix XCode projects.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4344 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 1baad523
......@@ -265,6 +265,8 @@ namespace Jack
}
}
assert(fNetAudioCaptureBuffer);
if (fParams.fReturnAudioChannels) {
switch (fParams.fSampleEncoder) {
......@@ -285,6 +287,8 @@ namespace Jack
}
}
assert(fNetAudioPlaybackBuffer);
} catch (exception&) {
jack_error("NetAudioBuffer allocation error...");
return false;
......@@ -788,41 +792,45 @@ namespace Jack
switch (fParams.fSampleEncoder) {
case JackFloatEncoder:
fNetAudioCaptureBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData );
fNetAudioCaptureBuffer = new NetFloatAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData);
break;
case JackIntEncoder:
fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData );
fNetAudioCaptureBuffer = new NetIntAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData);
break;
case JackCeltEncoder:
#ifdef CELT
fNetAudioCaptureBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps );
fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioCaptureBuffer);
if (fParams.fReturnAudioChannels) {
switch (fParams.fSampleEncoder) {
case JackFloatEncoder:
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData );
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData);
break;
case JackIntEncoder:
fNetAudioPlaybackBuffer = new NetIntAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData);
fNetAudioPlaybackBuffer = new NetIntAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData);
break;
case JackCeltEncoder:
#ifdef CELT
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps );
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps);
#endif
break;
}
}
assert(fNetAudioPlaybackBuffer);
} catch (exception&) {
jack_error("NetAudioBuffer allocation error...");
return false;
......
......@@ -9497,6 +9497,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE",
"-DJACK_32_64",
"-D__SMP__",
......@@ -9565,6 +9566,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE",
"-DJACK_32_64",
"-D__SMP__",
......@@ -14333,6 +14335,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -16445,6 +16448,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DJACK_MONITOR",
"-DSERVER_SIDE",
"-DJACK_32_64",
......@@ -16513,6 +16517,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-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