Reverted Ben's m_DefaultBufferSize stuff as it looks redundant. Will be put back...

diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h
index 99aba0517974f64018eb8c72ca9ab781e2c0a854..818ea717fdd58bbbe2a331fda8d250b81d190eb5 100644 (file)
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRAudioDeviceManager.h
@@ -59,7 +59,6 @@ struct DeviceInfo
        std::vector<int> 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<std::string> m_OutputChannels; ///< List of output channel names.
        std::vector<int> m_SamplingRates; ///< List of available sampling rates.
        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_CurrentBufferSize; ///< Currently selected buffer size.

diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp
index 9c97e6181ab1ec1ca9712e2d9e6dffdd6721229f..003bbf5488990d82351d1e9bd81d9bb9fd915568 100644 (file)
--- 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 7bea0b3f04b1404080fead32fa780ddf408e0708..935689aafe78aa879c0e0cdebd2713b3e85e8f02 100644 (file)
--- 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 67c170d5654e4d60d80553356408f49d5c68a2b0..a476f9a697479b0e7c48056a8ec83c139615e391 100644 (file)
--- 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;
        }