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

Hotfix crash in OSX engine dialog.

Browse source 
This is not really a fix, just some quick hack
to make ardour start at all if there’s no prior
CoreAudio EngineState in the config.
This commit is contained in:
Robin Gareus 2015-01-19 17:50:50 +01:00
parent d2fa2450aa
commit b0a5245ef0
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/backends/wavesaudio/waves_audiobackend.cc
View file

@ -224,6 +224,9 @@ float WavesAudioBackend::default_sample_rate () const
uint32_t uint32_t
WavesAudioBackend::default_buffer_size (const std::string& device_name) const WavesAudioBackend::default_buffer_size (const std::string& device_name) const
{ {
#ifdef __APPLE__
return AudioBackend::default_buffer_size (device_name);
#else
DeviceInfo devInfo; DeviceInfo devInfo;
WTErr err = _audio_device_manager.GetDeviceInfoByName(device_name, devInfo); WTErr err = _audio_device_manager.GetDeviceInfoByName(device_name, devInfo);
@ -233,6 +236,7 @@ WavesAudioBackend::default_buffer_size (const std::string& device_name) const
} }
return devInfo.m_DefaultBufferSize; return devInfo.m_DefaultBufferSize;
#endif
} }
std::vector<uint32_t> std::vector<uint32_t>

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

@ -115,6 +115,7 @@ WCMRCoreAudioDevice::WCMRCoreAudioDevice (WCMRCoreAudioDeviceManager *pManager,
m_CurrentSamplingRate = DEFAULT_SR; m_CurrentSamplingRate = DEFAULT_SR;
m_CurrentBufferSize = DEFAULT_BUFFERSIZE; m_CurrentBufferSize = DEFAULT_BUFFERSIZE;
m_DefaultBufferSize = DEFAULT_BUFFERSIZE;
m_StopRequested = true; m_StopRequested = true;
m_pInputData = NULL; m_pInputData = NULL;

2
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp
View file

@ -64,6 +64,8 @@ WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pM
} }
_m_inputBuffer = new float[__m_NumInputChannels * m_BufferSizes.back()]; _m_inputBuffer = new float[__m_NumInputChannels * m_BufferSizes.back()];
_m_outputBuffer = new float[__m_NumOutputChannels * m_BufferSizes.back()]; _m_outputBuffer = new float[__m_NumOutputChannels * m_BufferSizes.back()];
m_DefaultBufferSize = m_BufferSizes.back();
m_CurrentBufferSize = m_BufferSizes.back();
} }