From 9b0fc7b743219b8daecbef91c9772937fd874822 Mon Sep 17 00:00:00 2001 From: Valeriy Kamyshniy Date: Fri, 20 Feb 2015 13:48:14 +0200 Subject: [PATCH] [Summary] In internal Waves backend API, switching sample time from 32 bits to 64 bits. --- .../wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp | 7 ++++--- .../wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp index ea7a77b3cc..8c5b0e7fbc 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp @@ -328,6 +328,7 @@ WTErr WCMRCoreAudioDevice::UpdateDeviceId() } delete [] deviceIDs; + return retVal; } @@ -2315,9 +2316,9 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction //is this an input only device? if (m_OutputChannels.empty()) - AudioCallback (NULL, inNumberFrames, (uint32_t)inTimeStamp->mSampleTime, theStartTime); + AudioCallback (NULL, inNumberFrames, (uint64_t)inTimeStamp->mSampleTime, theStartTime); else if ((!m_OutputChannels.empty()) && (ioData->mBuffers[0].mNumberChannels == m_OutputChannels.size())) - AudioCallback ((float *)ioData->mBuffers[0].mData, inNumberFrames, (uint32_t)inTimeStamp->mSampleTime, theStartTime); + AudioCallback ((float *)ioData->mBuffers[0].mData, inNumberFrames, (uint64_t)inTimeStamp->mSampleTime, theStartTime); return retVal; } @@ -2338,7 +2339,7 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction //! \return true //! //********************************************************************************************** -int WCMRCoreAudioDevice::AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, uint32_t inSampleTime, uint64_t inCycleStartTime) +int WCMRCoreAudioDevice::AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, uint64_t inSampleTime, uint64_t inCycleStartTime) { struct WCMRAudioDeviceManagerClient::AudioCallbackData audioCallbackData = { diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h index eb8a1f2d3c..9f6f5c6e15 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h @@ -87,7 +87,7 @@ public: virtual WTErr ShowConfigPanel (void *pParam);///< Show Control Panel - in case of ASIO this will work only with Active device! - virtual int AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, uint32_t inSampleTime, uint64_t inCycleStartTime); + virtual int AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, uint64_t inSampleTime, uint64_t inCycleStartTime); AudioDeviceID DeviceID () {return m_DeviceID;}