Browse Source

Use macos-specific semaphore under macos

posix version can't be used due to missing sem_timedwait from macos side
tags/v1.9.15
falkTX 4 years ago
parent
commit
91e376cac9
2 changed files with 3 additions and 20 deletions
  1. +1
    -2
      common/wscript
  2. +2
    -18
      macosx/JackPlatformPlug_os.h

+ 1
- 2
common/wscript View File

@@ -116,8 +116,7 @@ def build(bld):
'../posix/JackPosixThread.cpp', '../posix/JackPosixThread.cpp',
'../posix/JackPosixMutex.cpp', '../posix/JackPosixMutex.cpp',
'../macosx/JackMachThread.mm', '../macosx/JackMachThread.mm',
#'../macosx/JackMachSemaphore.mm',
'../posix/JackPosixSemaphore.cpp',
'../macosx/JackMachSemaphore.mm',
'../posix/JackSocket.cpp', '../posix/JackSocket.cpp',
'../macosx/JackMachTime.c', '../macosx/JackMachTime.c',
] ]


+ 2
- 18
macosx/JackPlatformPlug_os.h View File

@@ -41,13 +41,6 @@ namespace Jack
class JackSocketNotifyChannel; class JackSocketNotifyChannel;


class JackNetUnixSocket; class JackNetUnixSocket;

#ifdef MY_TARGET_OS_IPHONE
class JackClient;
class JackGraphManager;
class JackEngineControl;
class JackSynchro;
#endif
} }


/* __JackPlatformMutex__ */ /* __JackPlatformMutex__ */
@@ -59,21 +52,13 @@ namespace Jack { typedef JackPosixMutex JackMutex; }
namespace Jack { typedef JackMachThread JackThread; } namespace Jack { typedef JackMachThread JackThread; }


/* __JackPlatformSynchro__ client activation */ /* __JackPlatformSynchro__ client activation */
#ifndef MY_TARGET_OS_IPHONE
//#include "JackMachSemaphore.h"
//namespace Jack { typedef JackMachSemaphore JackSynchro; }


#include "JackPosixSemaphore.h"
namespace Jack { typedef JackPosixSemaphore JackSynchro; }

#endif
#include "JackMachSemaphore.h"
namespace Jack { typedef JackMachSemaphore JackSynchro; }


/* __JackPlatformProcessSync__ */ /* __JackPlatformProcessSync__ */
#include "JackPosixProcessSync.h" #include "JackPosixProcessSync.h"
namespace Jack { typedef JackPosixProcessSync JackProcessSync; } namespace Jack { typedef JackPosixProcessSync JackProcessSync; }


#ifndef MY_TARGET_OS_IPHONE
/* __JackPlatformServerChannel__ */ /* __JackPlatformServerChannel__ */
#include "JackSocketServerChannel.h" #include "JackSocketServerChannel.h"
namespace Jack { typedef JackSocketServerChannel JackServerChannel; } namespace Jack { typedef JackSocketServerChannel JackServerChannel; }
@@ -89,7 +74,6 @@ namespace Jack { typedef JackSocketServerNotifyChannel JackServerNotifyChannel;
/* __JackPlatformNotifyChannel__ */ /* __JackPlatformNotifyChannel__ */
#include "JackSocketNotifyChannel.h" #include "JackSocketNotifyChannel.h"
namespace Jack { typedef JackSocketNotifyChannel JackNotifyChannel; } namespace Jack { typedef JackSocketNotifyChannel JackNotifyChannel; }
#endif


/* __JackPlatformNetSocket__ */ /* __JackPlatformNetSocket__ */
#include "JackNetUnixSocket.h" #include "JackNetUnixSocket.h"


Loading…
Cancel
Save