From 5b45f5b178250bf874a847633623cc44cd35887d Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Mar 2018 14:54:48 +0200 Subject: [PATCH] AudioOutput: more meaningful variable name --- sdrbase/audio/audiooutput.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sdrbase/audio/audiooutput.cpp b/sdrbase/audio/audiooutput.cpp index 2899f8a95..c7ddf62e0 100644 --- a/sdrbase/audio/audiooutput.cpp +++ b/sdrbase/audio/audiooutput.cpp @@ -217,31 +217,31 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) // QMutexLocker mutexLocker(&m_mutex); //#endif - unsigned int framesPerBuffer = maxLen / 4; + unsigned int samplesPerBuffer = maxLen / 4; - if (framesPerBuffer == 0) + if (samplesPerBuffer == 0) { return 0; } - if (m_mixBuffer.size() < framesPerBuffer * 2) + if (m_mixBuffer.size() < samplesPerBuffer * 2) { - m_mixBuffer.resize(framesPerBuffer * 2); // allocate 2 qint32 per frame (stereo) + m_mixBuffer.resize(samplesPerBuffer * 2); // allocate 2 qint32 per sample (stereo) - if (m_mixBuffer.size() != framesPerBuffer * 2) + if (m_mixBuffer.size() != samplesPerBuffer * 2) { return 0; } } - memset(&m_mixBuffer[0], 0x00, 2 * framesPerBuffer * sizeof(m_mixBuffer[0])); // start with silence + memset(&m_mixBuffer[0], 0x00, 2 * samplesPerBuffer * sizeof(m_mixBuffer[0])); // start with silence // sum up a block from all fifos for (std::list::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it) { // use outputBuffer as temp - yes, one memcpy could be saved - uint samples = (*it)->read((quint8*) data, framesPerBuffer, 1); + unsigned int samples = (*it)->read((quint8*) data, samplesPerBuffer, 1); const qint16* src = (const qint16*) data; std::vector::iterator dst = m_mixBuffer.begin(); @@ -250,7 +250,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) // qDebug("AudioOutput::readData: read %d samples vs %d requested", samples, framesPerBuffer); // } - for (uint i = 0; i < samples; i++) + for (unsigned int i = 0; i < samples; i++) { *dst += *src; ++src; @@ -266,7 +266,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) qint16* dst = (qint16*) data; qint32 sl, sr; - for (uint i = 0; i < framesPerBuffer; i++) + for (unsigned int i = 0; i < samplesPerBuffer; i++) { // left channel @@ -321,7 +321,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) } } - return framesPerBuffer * 4; + return samplesPerBuffer * 4; } qint64 AudioOutput::writeData(const char* data, qint64 len)