Updated Opus binaries. Also added option to disable the resampling in Opus decoder...

[lamexp/LameXP.git] / src / Filter_ToneAdjust.cpp

diff --git a/src/Filter_ToneAdjust.cpp b/src/Filter_ToneAdjust.cpp
index 126636c..65d4a2a 100644 (file)
--- a/src/Filter_ToneAdjust.cpp
+++ b/src/Filter_ToneAdjust.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -37,15 +37,15 @@ ToneAdjustFilter::ToneAdjustFilter(int bass, int treble)
                throw "Error initializing SoX filter. Tool 'sox.exe' is not registred!";
        }
 
-       m_bass = max(-2000, min(2000, bass));
-       m_treble = max(-2000, min(2000, treble));
+       m_bass = qMax(-2000, qMin(2000, bass));
+       m_treble = qMax(-2000, qMin(2000, treble));
 }
 
 ToneAdjustFilter::~ToneAdjustFilter(void)
 {
 }
 
-bool ToneAdjustFilter::apply(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool ToneAdjustFilter::apply(const QString &sourceFile, const QString &outputFile, AudioFileModel *formatInfo, volatile bool *abortFlag)
 {
        QProcess process;
        QStringList args;
@@ -121,7 +121,7 @@ bool ToneAdjustFilter::apply(const QString &sourceFile, const QString &outputFil
        emit statusUpdated(100);
        emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
 
-       if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit || QFileInfo(outputFile).size() == 0)
+       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
        {
                return false;
        }