More code refactoring and clean-up.

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

diff --git a/src/Decoder_Vorbis.cpp b/src/Decoder_Vorbis.cpp
index b0f6944..87e798b 100644 (file)
--- a/src/Decoder_Vorbis.cpp
+++ b/src/Decoder_Vorbis.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 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
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,19 +22,24 @@
 
 #include "Decoder_Vorbis.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
 VorbisDecoder::VorbisDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("oggdec.exe"))
+       m_binary(lamexp_tool_lookup("oggdec.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing Vorbis decoder. Tool 'oggdec.exe' is not registred!";
+               MUTILS_THROW("Error initializing Vorbis decoder. Tool 'oggdec.exe' is not registred!");
        }
 }
 
@@ -56,6 +62,7 @@ bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile,
 
        bool bTimeout = false;
        bool bAborted = false;
+       int prevProgress = -1;
 
        QRegExp regExp(" (\\d+)% decoded.");
 
@@ -68,7 +75,7 @@ bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile,
                        emit messageLogged("\nABORTED BY USER !!!");
                        break;
                }
-               process.waitForReadyRead();
+               process.waitForReadyRead(m_processTimeoutInterval);
                if(!process.bytesAvailable() && process.state() == QProcess::Running)
                {
                        process.kill();
@@ -85,7 +92,11 @@ bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile,
                        {
                                bool ok = false;
                                int progress = regExp.cap(1).toInt(&ok);
-                               if(ok) emit statusUpdated(progress);
+                               if(ok && (progress > prevProgress))
+                               {
+                                       emit statusUpdated(progress);
+                                       prevProgress = qMin(progress + 2, 99);
+                               }
                        }
                        else if(!text.isEmpty())
                        {
@@ -104,7 +115,7 @@ bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile,
        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;
        }