Updated mpg123 decoder binary to v1.22.0 (2015-02-24), compiled with GCC 4.9.2.

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

diff --git a/src/Decoder_Shorten.cpp b/src/Decoder_Shorten.cpp
index e2cafb8..5684907 100644 (file)
--- a/src/Decoder_Shorten.cpp
+++ b/src/Decoder_Shorten.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 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,8 +22,13 @@
 
 #include "Decoder_Shorten.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
@@ -30,11 +36,11 @@
 
 ShortenDecoder::ShortenDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("shorten.exe"))
+       m_binary(lamexp_tools_lookup("shorten.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing Shorten decoder. Tool 'shorten.exe' is not registred!";
+               MUTILS_THROW("Error initializing Shorten decoder. Tool 'shorten.exe' is not registred!");
        }
 }
 
@@ -71,11 +77,12 @@ bool ShortenDecoder::decode(const QString &sourceFile, const QString &outputFile
                        emit messageLogged("\nABORTED BY USER !!!");
                        break;
                }
-               process.waitForReadyRead(180000);
+               process.waitForReadyRead(m_processTimeoutInterval);
                if(!process.bytesAvailable() && process.state() == QProcess::Running)
                {
                        process.kill();
                        qWarning("Shorten process timed out <-- killing!");
+                       emit messageLogged("\nPROCESS TIMEOUT !!!");
                        bTimeout = true;
                        break;
                }
@@ -100,7 +107,7 @@ bool ShortenDecoder::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;
        }