Browse Source

Compile again on Snow Leopard.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/branches/libjacknet@3918 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 15 years ago
parent
commit
32a7808346
8 changed files with 28 additions and 11 deletions
  1. +2
    -2
      common/JackAudioAdapterInterface.cpp
  2. +1
    -1
      common/JackFilters.h
  3. +1
    -1
      common/JackNetAPI.cpp
  4. +2
    -2
      macosx/JackMachThread.cpp
  5. +3
    -3
      macosx/JackMachThread.h
  6. +9
    -2
      macosx/JackPlatformPlug_os.h
  7. +8
    -0
      macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj
  8. +2
    -0
      macosx/iphone/iPhoneNet_Prefix.pch

+ 2
- 2
common/JackAudioAdapterInterface.cpp View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#endif #endif


#include "JackAudioAdapter.h" #include "JackAudioAdapter.h"
#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
#include "JackLibSampleRateResampler.h" #include "JackLibSampleRateResampler.h"
#endif #endif
#include "JackTime.h" #include "JackTime.h"
@@ -194,7 +194,7 @@ namespace Jack
fRunning = false; fRunning = false;
} }
#ifdef TARGET_OS_IPHONE
#ifdef MY_TARGET_OS_IPHONE
void JackAudioAdapterInterface::Create() void JackAudioAdapterInterface::Create()
{} {}
#else #else


+ 1
- 1
common/JackFilters.h View File

@@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#endif #endif


#include "jack.h" #include "jack.h"
#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
#include "JackAtomicState.h" #include "JackAtomicState.h"
#endif #endif
#include <math.h> #include <math.h>


+ 1
- 1
common/JackNetAPI.cpp View File

@@ -877,7 +877,7 @@ SERVER_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** in
} }




#ifdef TARGET_OS_IPHONE
#ifdef MY_TARGET_OS_IPHONE


static void jack_format_and_log(int level, const char *prefix, const char *fmt, va_list ap) static void jack_format_and_log(int level, const char *prefix, const char *fmt, va_list ap)
{ {


+ 2
- 2
macosx/JackMachThread.cpp View File

@@ -31,7 +31,7 @@ int JackMachThread::SetThreadToPriority(pthread_t thread, UInt32 inPriority, Boo
// REAL-TIME / TIME-CONSTRAINT THREAD // REAL-TIME / TIME-CONSTRAINT THREAD
thread_time_constraint_policy_data_t theTCPolicy; thread_time_constraint_policy_data_t theTCPolicy;


#ifdef TARGET_OS_IPHONE
#ifdef MY_TARGET_OS_IPHONE
theTCPolicy.period = 0; theTCPolicy.period = 0;
theTCPolicy.computation = 0; theTCPolicy.computation = 0;
theTCPolicy.constraint = 0; theTCPolicy.constraint = 0;
@@ -138,7 +138,7 @@ int JackMachThread::GetParams(pthread_t thread, UInt64* period, UInt64* computat
&count, &count,
&get_default); &get_default);
if (res == KERN_SUCCESS) { if (res == KERN_SUCCESS) {
#ifdef TARGET_OS_IPHONE
#ifdef MY_TARGET_OS_IPHONE
*period = 0; *period = 0;
*computation = 0; *computation = 0;
*constraint = 0; *constraint = 0;


+ 3
- 3
macosx/JackMachThread.h View File

@@ -63,19 +63,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


#include <TargetConditionals.h> #include <TargetConditionals.h>


#ifdef TARGET_OS_IPHONE
#ifdef MY_TARGET_OS_IPHONE
typedef unsigned char Boolean; typedef unsigned char Boolean;
#endif #endif




#include "JackPosixThread.h" #include "JackPosixThread.h"
#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> #import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#endif #endif


#include <mach/thread_policy.h> #include <mach/thread_policy.h>
#include <mach/thread_act.h> #include <mach/thread_act.h>
#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
#include <CoreAudio/HostTime.h> #include <CoreAudio/HostTime.h>
#endif #endif




+ 9
- 2
macosx/JackPlatformPlug_os.h View File

@@ -33,6 +33,13 @@ namespace Jack
class JackMachServerNotifyChannel; class JackMachServerNotifyChannel;
class JackMachNotifyChannel; class JackMachNotifyChannel;
class JackNetUnixSocket; class JackNetUnixSocket;
#ifdef MY_TARGET_OS_IPHONE
class JackClient;
class JackGraphManager;
class JackEngineControl;
class JackSynchro;
#endif
} }


/* __JackPlatformMutex__ */ /* __JackPlatformMutex__ */
@@ -44,7 +51,7 @@ namespace Jack { typedef JackPosixMutex JackMutex; }
namespace Jack { typedef JackMachThread JackThread; } namespace Jack { typedef JackMachThread JackThread; }


/* __JackPlatformSynchro__ client activation */ /* __JackPlatformSynchro__ client activation */
#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
#include "JackMachSemaphore.h" #include "JackMachSemaphore.h"
namespace Jack { typedef JackMachSemaphore JackSynchro; } namespace Jack { typedef JackMachSemaphore JackSynchro; }
#endif #endif
@@ -53,7 +60,7 @@ namespace Jack { typedef JackMachSemaphore JackSynchro; }
#include "JackProcessSync.h" #include "JackProcessSync.h"
/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */ /* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */


#ifndef TARGET_OS_IPHONE
#ifndef MY_TARGET_OS_IPHONE
/* __JackPlatformServerChannel__ */ /* __JackPlatformServerChannel__ */
#include "JackMachServerChannel.h" #include "JackMachServerChannel.h"
namespace Jack { typedef JackMachServerChannel JackServerChannel; } namespace Jack { typedef JackMachServerChannel JackServerChannel; }


+ 8
- 0
macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj View File

@@ -719,6 +719,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREFIX_HEADER = iPhoneNet_Prefix.pch;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
../../common/jack, ../../common/jack,
../../common, ../../common,
@@ -739,6 +740,13 @@
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PREFIX_HEADER = iPhoneNet_Prefix.pch;
HEADER_SEARCH_PATHS = (
../../macosx,
../../posix,
../../common,
../../common/jack,
);
PREBINDING = NO; PREBINDING = NO;
PRODUCT_NAME = jacknet; PRODUCT_NAME = jacknet;
ZERO_LINK = NO; ZERO_LINK = NO;


+ 2
- 0
macosx/iphone/iPhoneNet_Prefix.pch View File

@@ -6,3 +6,5 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif

#define MY_TARGET_OS_IPHONE 1

Loading…
Cancel
Save