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

[Summary] In internal Waves backend API, switching sample time from 32 bits to 64 bits.

Browse source
This commit is contained in:
Valeriy Kamyshniy 2015-02-20 13:48:14 +02:00
parent 72e1510766
commit 9b0fc7b743
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -328,6 +328,7 @@ WTErr WCMRCoreAudioDevice::UpdateDeviceId()
} }
delete [] deviceIDs; delete [] deviceIDs;
return retVal;
} }
@ -2315,9 +2316,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, (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())) 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; return retVal;
} }
@ -2338,7 +2339,7 @@ OSStatus WCMRCoreAudioDevice::AudioIOProc(AudioUnitRenderActionFlags * ioAction
//! \return true //! \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 = struct WCMRAudioDeviceManagerClient::AudioCallbackData audioCallbackData =
{ {

2
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, 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;} AudioDeviceID DeviceID () {return m_DeviceID;}