Browse Source

fix netjack int/uint compilation failure on macosx

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2510 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
moret 17 years ago
parent
commit
05c991e5b7
3 changed files with 4 additions and 8 deletions
  1. +2
    -2
      common/JackNetDriver.cpp
  2. +1
    -1
      common/JackNetTool.h
  3. +1
    -5
      macosx/Jackdmp.xcodeproj/project.pbxproj

+ 2
- 2
common/JackNetDriver.cpp View File

@@ -355,7 +355,7 @@ namespace Jack
}
//midi
port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;
for ( int port_index = 0; port_index < fParams.fSendMidiChannels; port_index++ )
for ( uint port_index = 0; port_index < fParams.fSendMidiChannels; port_index++ )
{
snprintf ( alias, sizeof ( alias ) - 1, "%s:%s:out%d", fAliasName, fCaptureDriverName, port_index + 1 );
snprintf ( name, sizeof ( name ) - 1, "%s:midi_capture_%d", fClientControl->fName, port_index + 1 );
@@ -370,7 +370,7 @@ namespace Jack
}

port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal;
for ( int port_index = 0; port_index < fParams.fReturnMidiChannels; port_index++ )
for ( uint port_index = 0; port_index < fParams.fReturnMidiChannels; port_index++ )
{
snprintf ( alias, sizeof ( alias ) - 1, "%s:%s:in%d", fAliasName, fPlaybackDriverName, port_index + 1 );
snprintf ( name, sizeof ( name ) - 1, "%s:midi_playback_%d", fClientControl->fName, port_index + 1 );


+ 1
- 1
common/JackNetTool.h View File

@@ -172,5 +172,5 @@ namespace Jack
//set the recv timeout on a socket
EXPORT int SetRxTimeout ( int* sockfd, session_params_t* params );
//check if 'next' packet is really the next after 'previous'
EXPORT bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, int subcycles );
EXPORT bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, uint subcycles );
}

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

@@ -4589,7 +4589,6 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 4B699DD5097D427F00A18468 /* Build configuration list for PBXProject "Jackdmp" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* JackServer */;
projectDirPath = "";
@@ -9855,10 +9854,7 @@
4B363EE70DEB091C001F72D9 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
ppc,
);
ARCHS = i386;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_ENABLE_FIX_AND_CONTINUE = NO;


Loading…
Cancel
Save