second part of windows/osx macro change - forgot *.cpp files

diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp
index b04bb7ab71867005099d9ae21a1e3e0f8c62a48b..14cb1dd1247dcaa850d744981e75028dd98831da 100644 (file)
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp
@@ -7,7 +7,7 @@
 //! WCMRNativeAudioConnection and related class defienitions
 //!
 //---------------------------------------------------------------------------------*/
-#if defined(__MACOS__)
+#if defined(__APPLE__)
 #include <CoreAudio/CoreAudio.h>
 #endif
 
@@ -34,7 +34,7 @@
 WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pManager)
        : WCMRNativeAudioDevice (pManager, false /*useMultiThreading*/)
        , m_SilenceThread(0)
-#if defined (_WINDOWS)
+#if defined (PLATFORM_WINDOWS)
     , _waitableTimerForUsleep (CreateWaitableTimer(NULL, TRUE, NULL))
 #endif
 {
@@ -66,7 +66,7 @@ WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pM
 
 WCMRNativeAudioNoneDevice::~WCMRNativeAudioNoneDevice ()
 {
-#if defined (_WINDOWS)
+#if defined (PLATFORM_WINDOWS)
     if(_waitableTimerForUsleep) {
         CloseHandle(_waitableTimerForUsleep);
     }
@@ -141,7 +141,7 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState)
 
                pthread_attr_t attributes;
                size_t stack_size = 100000;
-#ifdef __MACOS__
+#ifdef __APPLE__
            stack_size = (((stack_size - 1) / PTHREAD_STACK_MIN) + 1) * PTHREAD_STACK_MIN;
 #endif
                if (pthread_attr_init (&attributes)) {
@@ -178,7 +178,7 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState)
 
 void WCMRNativeAudioNoneDevice::_SilenceThread()
 {
-#if defined(_WINDOWS)
+#if defined(PLATFORM_WINDOWS)
        float* theInpBuffers[__m_NumInputChannels];
        for(int i = 0; i < __m_NumInputChannels; ++i)
        {
@@ -228,7 +228,7 @@ void* WCMRNativeAudioNoneDevice::__SilenceThread(void *This)
        return 0;
 }
 
-#if defined(_WINDOWS)
+#if defined(PLATFORM_WINDOWS)
 void WCMRNativeAudioNoneDevice::_usleep(uint64_t duration_usec)
 { 
     LARGE_INTEGER ft; 
@@ -243,13 +243,13 @@ void WCMRNativeAudioNoneDevice::_usleep(uint64_t duration_usec)
 uint64_t
 WCMRNativeAudioNoneDevice::__get_time_nanos ()
 {
-#ifdef __MACOS__
+#ifdef __APPLE__
     // here we exploit the time counting API which is used by the WCMRCoreAudioDeviceManager. However,
     // the API should be a part of WCMRCoreAudioDeviceManager to give a chance of being tied to the
     // audio device transport time�.
     return AudioConvertHostTimeToNanos (AudioGetCurrentHostTime ());
     
-#elif _WINDOWS
+#elif PLATFORM_WINDOWS
     
     LARGE_INTEGER Frequency, Count ;
 

diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
index 2f6cd710ff482e25271411684af562c9307676b9..6095cd6a85ca0d7d0b2bba0a1a4e820706681806 100644 (file)
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
@@ -1033,7 +1033,7 @@ void WCMRPortAudioDevice::resetDevice (bool callerIsWaiting /*=false*/ )
 }
 
 
-#ifdef _WINDOWS
+#ifdef PLATFORM_WINDOWS
 
 long WCMRPortAudioDevice::StaticASIOMessageHook (void *pRefCon, long selector, long value, void* message, double* opt)
 {
@@ -1250,7 +1250,7 @@ WTErr WCMRPortAudioDevice::ShowConfigPanel (void *pParam)
        
        if (Active())
        {
-#ifdef _WINDOWS
+#ifdef PLATFORM_WINDOWS
                if(Pa_GetHostApiInfo(Pa_GetDeviceInfo(m_DeviceID)->hostApi)->type == paASIO)
                {
                        // stop and deactivate the device

diff --git a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp b/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp
index a644b61c92cd6339414ab06909cdc3d80687b41d..c98aa571da5f1d617cfb2b828ed2e58cdd76e740 100644 (file)
--- a/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp
+++ b/libs/backends/wavesaudio/wavesapi/miscutils/UMicroseconds.cpp
@@ -1,7 +1,7 @@
-#ifdef _WINDOWS
+#ifdef PLATFORM_WINDOWS
     #include "IncludeWindows.h"
 #endif
-#if defined(__linux__) || defined(__MACOS__)
+#if defined(__linux__) || defined(__APPLE__)
        #include <sys/time.h>
 #endif
 
@@ -10,7 +10,7 @@
 namespace wvNS { 
 UMicroseconds& UMicroseconds::ReadTime()
 {
-#ifdef _WINDOWS
+#ifdef PLATFORM_WINDOWS
        LARGE_INTEGER Frequency, Count ;
 
        QueryPerformanceFrequency(&Frequency) ;
@@ -18,7 +18,7 @@ UMicroseconds& UMicroseconds::ReadTime()
        theTime = uint64_t((Count.QuadPart * 1000000.0 / Frequency.QuadPart));
 #endif
 
-#if defined(__linux__) || defined(__MACOS__)
+#if defined(__linux__) || defined(__APPLE__)
 //     Mac code replaced by posix calls, to reduce Carbon dependency. 
        timeval buf;
 
@@ -32,7 +32,7 @@ UMicroseconds& UMicroseconds::ReadTime()
 }
 /*
  Removed in favor of the posix implementation. 
-#ifdef __MACOS__
+#ifdef __APPLE__
        uint32_t UMicroseconds::hi() {return reinterpret_cast<UnsignedWide*>(&theTime)->hi;}
        uint32_t UMicroseconds::lo() {return reinterpret_cast<UnsignedWide*>(&theTime)->lo;}
 #endif

diff --git a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp b/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp
index 123c41678c87d0e7cb73981bff5c22ea5c708434..22202894b3daf0694f0b864977216dca7d961c71 100644 (file)
--- a/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp
+++ b/libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp
@@ -7,10 +7,10 @@
 #endif // XPLATFORMTHREADS_WINDOWS
 
 
-#if defined(__MACOS__)
+#if defined(__APPLE__)
     #include <CoreServices/CoreServices.h>
     #include <stdio.h>
-#endif // __MACOS__
+#endif // __APPLE__
 
 #if XPLATFORMTHREADS_POSIX
     #include </usr/include/unistd.h>   // avoid the framework version and use the /usr/include version
@@ -87,7 +87,7 @@ namespace wvThread
         return nTicksPerMicrosecond;
     }
     
-#if defined(__MACOS__) //&& !defined(__MACH__)
+#if defined(__APPLE__) //&& !defined(__MACH__)
 
     
     bool FindNetInterfaceByIPAddress(const char *sIP, char *sInterface) // sIP and sInterface are both char[16]
@@ -143,7 +143,7 @@ namespace wvThread
             return timestamp(uint32_t(TSC.QuadPart/nTicksPerMicrosecond));
         }
         else return timestamp(0);
-#elif defined(__MACOS__)
+#elif defined(__APPLE__)
         if (nTicksPerMicrosecond) {} // prevent 'unused' warnings
         UnsignedWide usecs;
         ::Microseconds(&usecs);