smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Following review Paul did after 9b0fc7b743 [9b0fc7b] and 72e1510766 [72e1510].

Browse source
This commit is contained in:
Valeriy Kamyshniy 2015-02-20 20:19:33 +02:00 • committed by Paul Davis
parent d6574c9c40
commit 91ae97d5c9
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h
View file

@ -126,8 +126,8 @@ class WCMRAudioDeviceManagerClient
const float *acdInputBuffer; const float *acdInputBuffer;
float *acdOutputBuffer; float *acdOutputBuffer;
size_t acdFrames; size_t acdFrames;
uint64_t acdSampleTime; int64_t acdSampleTime;
uint64_t acdCycleStartTimeNanos; int64_t acdCycleStartTimeNanos;
}; };
virtual void AudioDeviceManagerNotification (NotificationReason WCUNUSEDPARAM(reason), void *WCUNUSEDPARAM(pParam)) {} virtual void AudioDeviceManagerNotification (NotificationReason WCUNUSEDPARAM(reason), void *WCUNUSEDPARAM(pParam)) {}

6
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp
View file

@ -2232,9 +2232,9 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction
//is this an input only device? //is this an input only device?
if (m_OutputChannels.empty()) 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())) 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; return retVal;
} }
@ -2255,7 +2255,7 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction
//! \return true //! \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 = struct WCMRAudioDeviceManagerClient::AudioCallbackData audioCallbackData =
{ {

6
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.h
View file

@ -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 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;} AudioDeviceID DeviceID () {return m_DeviceID;}
@ -100,8 +100,8 @@ protected:
AudioDeviceID m_DeviceID; ///< The CoreAudio device id AudioDeviceID m_DeviceID; ///< The CoreAudio device id
bool m_StopRequested; ///< should be set to true when want to stop, set to false otherwise. 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. 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. int64_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_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_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. int m_ChangeCheckCounter; ///< The number of idle calls passed since we checked the buffer size change.

4
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.h
View file

@ -96,8 +96,8 @@ protected:
PaStream* m_PortAudioStream; ///< Port audio stream, when the device is active! 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. 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. 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. int64_t m_SampleCounter; ///< The current running sample counter, updated by the audio callback.
uint64_t m_SampleCountAtLastIdle; int64_t m_SampleCountAtLastIdle;
int m_DropsDetected; ///< Number of times audio drops have been detected so far. 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. int m_DropsReported; ///< Number of times audio drops have been reported so far to the client.