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.

This commit is contained in:
LoRd_MuldeR 2011-08-27 21:28:20 +02:00
parent 037287ddb9
commit bcbd8defce
3 changed files with 7 additions and 4 deletions

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 676 #define VER_LAMEXP_BUILD 678
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions

View File

@ -481,7 +481,6 @@ void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index)
void ProcessingDialog::logViewSectionSizeChanged(int logicalIndex, int oldSize, int newSize) void ProcessingDialog::logViewSectionSizeChanged(int logicalIndex, int oldSize, int newSize)
{ {
qDebug("sectionResized");
if(logicalIndex == 1) if(logicalIndex == 1)
{ {
if(QHeaderView *hdr = view_log->horizontalHeader()) if(QHeaderView *hdr = view_log->horizontalHeader())

View File

@ -402,11 +402,15 @@ void ProcessThread::insertDownmixFilter(void)
applyDownmixing = false; applyDownmixing = false;
} }
} }
//Now add the downmixing filter, if needed //Now add the downmixing filter, if needed
if(applyDownmixing) if(applyDownmixing)
{ {
m_filters.prepend(new DownmixFilter()); unsigned int channels = m_audioFile.formatAudioChannels();
if((channels == 0) || (channels > 2))
{
m_filters.prepend(new DownmixFilter());
}
} }
} }