Browse Source

Fix XCode projects.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4344 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
cd3073854b
2 changed files with 19 additions and 6 deletions
  1. +14
    -6
      common/JackNetInterface.cpp
  2. +5
    -0
      macosx/Jackdmp.xcodeproj/project.pbxproj

+ 14
- 6
common/JackNetInterface.cpp View File

@@ -265,6 +265,8 @@ namespace Jack
} }
} }


assert(fNetAudioCaptureBuffer);

if (fParams.fReturnAudioChannels) { if (fParams.fReturnAudioChannels) {


switch (fParams.fSampleEncoder) { switch (fParams.fSampleEncoder) {
@@ -285,6 +287,8 @@ namespace Jack
} }
} }


assert(fNetAudioPlaybackBuffer);

} catch (exception&) { } catch (exception&) {
jack_error("NetAudioBuffer allocation error..."); jack_error("NetAudioBuffer allocation error...");
return false; return false;
@@ -788,41 +792,45 @@ namespace Jack
switch (fParams.fSampleEncoder) { switch (fParams.fSampleEncoder) {


case JackFloatEncoder: case JackFloatEncoder:
fNetAudioCaptureBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData );
fNetAudioCaptureBuffer = new NetFloatAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData);
break; break;


case JackIntEncoder: case JackIntEncoder:
fNetAudioCaptureBuffer = new NetIntAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData );
fNetAudioCaptureBuffer = new NetIntAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData);
break; break;


case JackCeltEncoder: case JackCeltEncoder:
#ifdef CELT #ifdef CELT
fNetAudioCaptureBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps );
fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps);
#endif #endif
break; break;
} }
} }


assert(fNetAudioCaptureBuffer);

if (fParams.fReturnAudioChannels) { if (fParams.fReturnAudioChannels) {


switch (fParams.fSampleEncoder) { switch (fParams.fSampleEncoder) {


case JackFloatEncoder: case JackFloatEncoder:
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData );
fNetAudioPlaybackBuffer = new NetFloatAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData);
break; break;


case JackIntEncoder: case JackIntEncoder:
fNetAudioPlaybackBuffer = new NetIntAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData);
fNetAudioPlaybackBuffer = new NetIntAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData);
break; break;


case JackCeltEncoder: case JackCeltEncoder:
#ifdef CELT #ifdef CELT
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer ( &fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps );
fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps);
#endif #endif
break; break;
} }
} }


assert(fNetAudioPlaybackBuffer);

} catch (exception&) { } catch (exception&) {
jack_error("NetAudioBuffer allocation error..."); jack_error("NetAudioBuffer allocation error...");
return false; return false;


+ 5
- 0
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -9497,6 +9497,7 @@
"-DUSE_POSIX_SHM", "-DUSE_POSIX_SHM",
); );
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE", "-DSERVER_SIDE",
"-DJACK_32_64", "-DJACK_32_64",
"-D__SMP__", "-D__SMP__",
@@ -9565,6 +9566,7 @@
"-DUSE_POSIX_SHM", "-DUSE_POSIX_SHM",
); );
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE", "-DSERVER_SIDE",
"-DJACK_32_64", "-DJACK_32_64",
"-D__SMP__", "-D__SMP__",
@@ -14333,6 +14335,7 @@
"-DUSE_POSIX_SHM", "-DUSE_POSIX_SHM",
); );
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DSERVER_SIDE", "-DSERVER_SIDE",
"-D__SMP__", "-D__SMP__",
"-DMACH_RPC_MACH_SEMA", "-DMACH_RPC_MACH_SEMA",
@@ -16445,6 +16448,7 @@
"-DUSE_POSIX_SHM", "-DUSE_POSIX_SHM",
); );
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DJACK_MONITOR", "-DJACK_MONITOR",
"-DSERVER_SIDE", "-DSERVER_SIDE",
"-DJACK_32_64", "-DJACK_32_64",
@@ -16513,6 +16517,7 @@
"-DUSE_POSIX_SHM", "-DUSE_POSIX_SHM",
); );
OTHER_CPLUSPLUSFLAGS = ( OTHER_CPLUSPLUSFLAGS = (
"-DCELT",
"-DJACK_MONITOR", "-DJACK_MONITOR",
"-DSERVER_SIDE", "-DSERVER_SIDE",
"-DJACK_32_64", "-DJACK_32_64",


Loading…
Cancel
Save