Browse Source

Correct XCode project.

tags/v1.9.10
Stephane Letz 11 years ago
parent
commit
274752d275
3 changed files with 8 additions and 9 deletions
  1. +3
    -1
      common/JackNetAPI.cpp
  2. +0
    -3
      common/JackNetTool.cpp
  3. +5
    -5
      macosx/Jackdmp.xcodeproj/project.pbxproj

+ 3
- 1
common/JackNetAPI.cpp View File

@@ -380,7 +380,8 @@ struct JackNetExtMaster : public JackNetMasterInterface {
int Read(int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer, int frames)
{
try {
// frames = -1 means : entire buffer
if (frames < 0) frames = fParams.fPeriodSize;
int read_frames;
@@ -432,6 +433,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
{
try {
// frames = -1 means : entire buffer
if (frames < 0) frames = fParams.fPeriodSize;
assert(audio_output == fParams.fSendAudioChannels);


+ 0
- 3
common/JackNetTool.cpp View File

@@ -163,7 +163,6 @@ namespace Jack
fPortBuffer[port_index] + (fPortBuffer[port_index]->buffer_size - fPortBuffer[port_index]->write_pos),
fPortBuffer[port_index]->write_pos);
pos += fPortBuffer[port_index]->write_pos;

JackMidiBuffer* midi_buffer = reinterpret_cast<JackMidiBuffer*>(write_pos);
MidiBufferHToN(midi_buffer, midi_buffer);
}
@@ -1210,7 +1209,6 @@ namespace Jack

SERVER_EXPORT void PacketHeaderHToN(packet_header_t* src_header, packet_header_t* dst_header)
{
//printf("PacketHeaderHToN _packet_header size %d\n", sizeof(_packet_header));
memcpy(dst_header, src_header, sizeof(packet_header_t));
dst_header->fDataType = htonl(src_header->fDataType);
dst_header->fDataStream = htonl(src_header->fDataStream);
@@ -1226,7 +1224,6 @@ namespace Jack

SERVER_EXPORT void PacketHeaderNToH(packet_header_t* src_header, packet_header_t* dst_header)
{
//printf("PacketHeaderNToH _packet_header size %d\n", sizeof(_packet_header));
memcpy(dst_header, src_header, sizeof(packet_header_t));
dst_header->fDataType = ntohl(src_header->fDataType);
dst_header->fDataStream = ntohl(src_header->fDataStream);


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

@@ -2021,7 +2021,7 @@
4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; };
4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; };
4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; };
4BFA5E980DEC4D9C00FA4CDB /* testMutex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testMutex; sourceTree = BUILT_PRODUCTS_DIR; };
4BFA5E980DEC4D9C00FA4CDB /* testSem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testSem; sourceTree = BUILT_PRODUCTS_DIR; };
4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; };
4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; };
4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2829,7 +2829,7 @@
4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */,
4B363F350DEB0BD1001F72D9 /* jack_showtime */,
4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */,
4BFA5E980DEC4D9C00FA4CDB /* testMutex */,
4BFA5E980DEC4D9C00FA4CDB /* testSem */,
4BFA828C0DF6A9E40087B4E1 /* jack_evmon */,
4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */,
4BFA82AB0DF6A9E40087B4E1 /* jack_rec */,
@@ -6188,7 +6188,7 @@
name = "testMutex Universal";
productInstallPath = /usr/local/bin;
productName = testSem;
productReference = 4BFA5E980DEC4D9C00FA4CDB /* testMutex */;
productReference = 4BFA5E980DEC4D9C00FA4CDB /* testSem */;
productType = "com.apple.product-type.tool";
};
4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = {
@@ -6366,6 +6366,7 @@
isa = PBXProject;
buildConfigurationList = 4B699DD5097D427F00A18468 /* Build configuration list for PBXProject "Jackdmp" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -9131,8 +9132,7 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
);


Loading…
Cancel
Save