From bcbd8defce811fe223158af058f4c9f4c569b2e7 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 27 Aug 2011 21:28:20 +0200 Subject: [PATCH] Revert: Avoid applying the Downmix filter on Mono/Stereo sources. Otherwise we need to decode (i.e. copy) Wave files, even when the Downmix filter does nothing. --- src/Config.h | 2 +- src/Dialog_Processing.cpp | 1 - src/Thread_Process.cpp | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Config.h b/src/Config.h index d3926855..e02cf3c1 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 676 +#define VER_LAMEXP_BUILD 678 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index 8fb2b532..644bd80b 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -481,7 +481,6 @@ void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index) void ProcessingDialog::logViewSectionSizeChanged(int logicalIndex, int oldSize, int newSize) { - qDebug("sectionResized"); if(logicalIndex == 1) { if(QHeaderView *hdr = view_log->horizontalHeader()) diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp index 68c539a6..716f79af 100644 --- a/src/Thread_Process.cpp +++ b/src/Thread_Process.cpp @@ -402,11 +402,15 @@ void ProcessThread::insertDownmixFilter(void) applyDownmixing = false; } } - + //Now add the downmixing filter, if needed if(applyDownmixing) { - m_filters.prepend(new DownmixFilter()); + unsigned int channels = m_audioFile.formatAudioChannels(); + if((channels == 0) || (channels > 2)) + { + m_filters.prepend(new DownmixFilter()); + } } }