aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qmmp/channelconverter.cpp2
-rw-r--r--src/qmmp/recycler.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmmp/channelconverter.cpp b/src/qmmp/channelconverter.cpp
index b8139e4e6..9c693a05e 100644
--- a/src/qmmp/channelconverter.cpp
+++ b/src/qmmp/channelconverter.cpp
@@ -68,7 +68,7 @@ void ChannelConverter::applyEffect(Buffer *b)
int j = 0;
float *data = b->data;
- for(i = 0; i < b->samples; ++i)
+ for(i = 0; i < b->samples / m_channels; ++i)
{
memcpy(m_tmp_buf, data, m_channels * sizeof(float));
for(j = 0; j < m_channels; ++j)
diff --git a/src/qmmp/recycler.cpp b/src/qmmp/recycler.cpp
index a5aaf835c..52314a9d0 100644
--- a/src/qmmp/recycler.cpp
+++ b/src/qmmp/recycler.cpp
@@ -34,9 +34,9 @@ Recycler::~Recycler()
void Recycler::configure(quint32 freq, int chan)
{
- size_t block_size = chan * QMMP_BLOCK_FRAMES;
+ size_t block_samples = chan * QMMP_BLOCK_FRAMES;
unsigned int buffer_count = freq * QmmpSettings::instance()->bufferSize() / 1000 / QMMP_BLOCK_FRAMES;
- if(block_size == m_block_samples && buffer_count == m_buffer_count)
+ if(block_samples == m_block_samples && buffer_count == m_buffer_count)
return;
for (unsigned int i = 0; i < m_buffer_count; i++)
@@ -50,7 +50,7 @@ void Recycler::configure(quint32 freq, int chan)
m_done_index = 0;
m_current_count = 0;
m_blocked = 0;
- m_block_samples = block_size;
+ m_block_samples = block_samples;
m_buffer_count = buffer_count;