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

Reverted Ben's m_DefaultBufferSize stuff as it looks redundant. Will be put back if we establish the opposite

Browse source
This commit is contained in:
GZharun 2015-05-14 17:44:04 +03:00 • committed by Paul Davis
parent 6485300479
commit 21b9e180bd
4 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,6 @@ struct DeviceInfo
std::vector<int> m_AvailableSampleRates; std::vector<int> m_AvailableSampleRates;
unsigned int m_MaxInputChannels; unsigned int m_MaxInputChannels;
unsigned int m_MaxOutputChannels; unsigned int m_MaxOutputChannels;
unsigned int m_DefaultBufferSize;
DeviceInfo(): DeviceInfo():
m_DeviceId(-1), m_DeviceName("Unknown"), m_MaxInputChannels(0), m_MaxOutputChannels(0) m_DeviceId(-1), m_DeviceName("Unknown"), m_MaxInputChannels(0), m_MaxOutputChannels(0)
@ -199,7 +198,6 @@ protected:
std::vector<std::string> m_OutputChannels; ///< List of output channel names. std::vector<std::string> m_OutputChannels; ///< List of output channel names.
std::vector<int> m_SamplingRates; ///< List of available sampling rates. std::vector<int> m_SamplingRates; ///< List of available sampling rates.
std::vector<int> m_BufferSizes; ///< List of available buffer sizes. std::vector<int> m_BufferSizes; ///< List of available buffer sizes.
int m_DefaultBufferSize; ///soundcard preferred buffer size
int m_CurrentSamplingRate; ///< Currently selected sampling rate. int m_CurrentSamplingRate; ///< Currently selected sampling rate.
int m_CurrentBufferSize; ///< Currently selected buffer size. int m_CurrentBufferSize; ///< Currently selected buffer size.

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

@ -115,7 +115,6 @@ 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;

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

@ -64,7 +64,6 @@ 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(); m_CurrentBufferSize = m_BufferSizes.back();
} }

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

@ -118,7 +118,6 @@ WCMRPortAudioDevice::WCMRPortAudioDevice (WCMRPortAudioDeviceManager *pManager,
m_PortAudioStream = NULL; m_PortAudioStream = NULL;
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;
@ -362,7 +361,6 @@ void WCMRPortAudioDevice::updateDeviceInfo (bool callerIsWaiting/*=false*/)
{ {
std::cout << "API::Device " << m_DeviceName << " Buffers: " << minSize << " " << maxSize << " " << preferredSize << std::endl; std::cout << "API::Device " << m_DeviceName << " Buffers: " << minSize << " " << maxSize << " " << preferredSize << std::endl;
m_DefaultBufferSize = preferredSize;
m_BufferSizes.push_back (preferredSize); m_BufferSizes.push_back (preferredSize);
useDefaultBuffers = false; useDefaultBuffers = false;
} }