From cd3073854b1601b9e3572ed42f1f5fca13a7d7fe Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 21 Apr 2011 14:44:37 +0000 Subject: [PATCH] Fix XCode projects. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4344 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetInterface.cpp | 20 ++++++++++++++------ macosx/Jackdmp.xcodeproj/project.pbxproj | 5 +++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp index 5eb0487f..b7fe7a69 100644 --- a/common/JackNetInterface.cpp +++ b/common/JackNetInterface.cpp @@ -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; diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 5961dd82..14178e71 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -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",