From 91ae97d5c96e18cbb1f9937a961bd503ee8d5a38 Mon Sep 17 00:00:00 2001 From: Valeriy Kamyshniy Date: Fri, 20 Feb 2015 20:19:33 +0200 Subject: [Summary] Following review Paul did after 9b0fc7b743219b8daecbef91c9772937fd874822 [9b0fc7b] and 72e1510766608180fc7975fde35c9155494a8b5d [72e1510]. --- .../wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h | 4 ++-- .../wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp | 6 +++--- .../wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h | 6 +++--- .../wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libs/backends') diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h index db0104a25d..99aba05179 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h @@ -126,8 +126,8 @@ class WCMRAudioDeviceManagerClient const float *acdInputBuffer; float *acdOutputBuffer; size_t acdFrames; - uint64_t acdSampleTime; - uint64_t acdCycleStartTimeNanos; + int64_t acdSampleTime; + int64_t acdCycleStartTimeNanos; }; virtual void AudioDeviceManagerNotification (NotificationReason WCUNUSEDPARAM(reason), void *WCUNUSEDPARAM(pParam)) {} diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp index 347cf6d483..8cfa096c2a 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp @@ -2232,9 +2232,9 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction //is this an input only device? if (m_OutputChannels.empty()) - AudioCallback (NULL, inNumberFrames, (uint64_t)inTimeStamp->mSampleTime, theStartTime); + AudioCallback (NULL, inNumberFrames, (int64_t)inTimeStamp->mSampleTime, theStartTime); else if ((!m_OutputChannels.empty()) && (ioData->mBuffers[0].mNumberChannels == m_OutputChannels.size())) - AudioCallback ((float *)ioData->mBuffers[0].mData, inNumberFrames, (uint64_t)inTimeStamp->mSampleTime, theStartTime); + AudioCallback ((float *)ioData->mBuffers[0].mData, inNumberFrames, (int64_t)inTimeStamp->mSampleTime, theStartTime); return retVal; } @@ -2255,7 +2255,7 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction //! \return true //! //********************************************************************************************** -int WCMRCoreAudioDevice::AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, uint64_t inSampleTime, uint64_t inCycleStartTime) +int WCMRCoreAudioDevice::AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, int64_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 445de68fb0..a3269f63fb 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, uint64_t inSampleTime, uint64_t inCycleStartTime); + virtual int AudioCallback (float *pOutputBuffer, unsigned long framesPerBuffer, int64_t inSampleTime, uint64_t inCycleStartTime); AudioDeviceID DeviceID () {return m_DeviceID;} @@ -100,8 +100,8 @@ protected: AudioDeviceID m_DeviceID; ///< The CoreAudio device id bool m_StopRequested; ///< should be set to true when want to stop, set to false otherwise. float *m_pInputData; ///< This is what came in with the most recent callback. - uint64_t m_SampleCounter; ///< The current running sample counter, updated by the audio callback. - uint64_t m_SampleCountAtLastIdle; ///< What was the sample count last time we checked... + int64_t m_SampleCounter; ///< The current running sample counter, updated by the audio callback. + int64_t m_SampleCountAtLastIdle; ///< What was the sample count last time we checked... int m_StalledSampleCounter; ///< The number of idle calls with same sample count detected int m_ChangeCheckCounter; ///< The number of idle calls passed since we checked the buffer size change. diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h index a93d2d745a..8f099ec9b5 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h @@ -96,8 +96,8 @@ protected: PaStream* m_PortAudioStream; ///< Port audio stream, when the device is active! bool m_StopRequested; ///< should be set to true when want to stop, set to false otherwise. const float *m_pInputData; ///< This is what came in with the most recent callback. - uint64_t m_SampleCounter; ///< The current running sample counter, updated by the audio callback. - uint64_t m_SampleCountAtLastIdle; + int64_t m_SampleCounter; ///< The current running sample counter, updated by the audio callback. + int64_t m_SampleCountAtLastIdle; int m_DropsDetected; ///< Number of times audio drops have been detected so far. int m_DropsReported; ///< Number of times audio drops have been reported so far to the client. -- cgit v1.2.3