From 21b9e180bde3addf7651e237661e7a73be61e782 Mon Sep 17 00:00:00 2001 From: GZharun Date: Thu, 14 May 2015 17:44:04 +0300 Subject: [PATCH] Reverted Ben's m_DefaultBufferSize stuff as it looks redundant. Will be put back if we establish the opposite --- .../wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h | 2 -- .../wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp | 1 - .../wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp | 1 - .../wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp | 2 -- 4 files changed, 6 deletions(-) diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h index 99aba05179..818ea717fd 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h @@ -59,7 +59,6 @@ struct DeviceInfo std::vector m_AvailableSampleRates; unsigned int m_MaxInputChannels; unsigned int m_MaxOutputChannels; - unsigned int m_DefaultBufferSize; DeviceInfo(): m_DeviceId(-1), m_DeviceName("Unknown"), m_MaxInputChannels(0), m_MaxOutputChannels(0) @@ -199,7 +198,6 @@ protected: std::vector m_OutputChannels; ///< List of output channel names. std::vector m_SamplingRates; ///< List of available sampling rates. std::vector m_BufferSizes; ///< List of available buffer sizes. - int m_DefaultBufferSize; ///soundcard preferred buffer size int m_CurrentSamplingRate; ///< Currently selected sampling rate. int m_CurrentBufferSize; ///< Currently selected buffer size. diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp index 9c97e6181a..003bbf5488 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp @@ -115,7 +115,6 @@ WCMRCoreAudioDevice::WCMRCoreAudioDevice (WCMRCoreAudioDeviceManager *pManager, m_CurrentSamplingRate = DEFAULT_SR; m_CurrentBufferSize = DEFAULT_BUFFERSIZE; - m_DefaultBufferSize = DEFAULT_BUFFERSIZE; m_StopRequested = true; m_pInputData = NULL; diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp index 7bea0b3f04..935689aafe 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp @@ -64,7 +64,6 @@ WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pM } _m_inputBuffer = new float[__m_NumInputChannels * m_BufferSizes.back()]; _m_outputBuffer = new float[__m_NumOutputChannels * m_BufferSizes.back()]; - m_DefaultBufferSize = m_BufferSizes.back(); m_CurrentBufferSize = m_BufferSizes.back(); } diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp index 67c170d565..a476f9a697 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp @@ -118,7 +118,6 @@ WCMRPortAudioDevice::WCMRPortAudioDevice (WCMRPortAudioDeviceManager *pManager, m_PortAudioStream = NULL; m_CurrentSamplingRate = DEFAULT_SR; m_CurrentBufferSize = DEFAULT_BUFFERSIZE; - m_DefaultBufferSize = DEFAULT_BUFFERSIZE; m_StopRequested = true; 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; - m_DefaultBufferSize = preferredSize; m_BufferSizes.push_back (preferredSize); useDefaultBuffers = false; } -- 2.30.2