More code refactoring and clean-up.

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

diff --git a/src/Decoder_ALAC.cpp b/src/Decoder_ALAC.cpp
index e69849c..ecdc438 100644 (file)
--- a/src/Decoder_ALAC.cpp
+++ b/src/Decoder_ALAC.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 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,8 +22,13 @@
 
 #include "Decoder_ALAC.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
@@ -30,11 +36,11 @@
 
 ALACDecoder::ALACDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("alac.exe"))
+       m_binary(lamexp_tool_lookup("refalac.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing ALAC decoder. Tool 'alac.exe' is not registred!";
+               MUTILS_THROW("Error initializing ALAC decoder. Tool 'refalac.exe' is not registred!");
        }
 }
 
@@ -47,7 +53,8 @@ bool ALACDecoder::decode(const QString &sourceFile, const QString &outputFile, v
        QProcess process;
        QStringList args;
 
-       args << "-f" << QDir::toNativeSeparators(outputFile);
+       args << "--decode";
+       args << "-o" << QDir::toNativeSeparators(outputFile);
        args << QDir::toNativeSeparators(sourceFile);
 
        if(!startProcess(process, m_binary, args))
@@ -57,9 +64,11 @@ bool ALACDecoder::decode(const QString &sourceFile, const QString &outputFile, v
 
        bool bTimeout = false;
        bool bAborted = false;
+       int prevProgress = -1;
 
        //The ALAC Decoder doesn't actually send any status updates :-[
-       emit statusUpdated(20 + (QUuid::createUuid().data1 % 60));
+       //emit statusUpdated(20 + (QUuid::createUuid().data1 % 60));
+       QRegExp regExp("\\[(\\d+)\\.(\\d)%\\]");
 
        while(process.state() != QProcess::NotRunning)
        {
@@ -83,7 +92,23 @@ bool ALACDecoder::decode(const QString &sourceFile, const QString &outputFile, v
                {
                        QByteArray line = process.readLine();
                        QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(!text.isEmpty())
+                       if(regExp.lastIndexIn(text) >= 0)
+                       {
+                               bool ok[2] = {false, false};
+                               int intVal[2] = {0, 0};
+                               intVal[0] = regExp.cap(1).toInt(&ok[0]);
+                               intVal[1] = regExp.cap(2).toInt(&ok[1]);
+                               if(ok[0] && ok[1])
+                               {
+                                       int progress = qRound(static_cast<double>(intVal[0]) + (static_cast<double>(intVal[1]) / 10.0));
+                                       if(progress > prevProgress)
+                                       {
+                                               emit statusUpdated(progress);
+                                               prevProgress = qMin(progress + 2, 99);
+                                       }
+                               }
+                       }
+                       else if(!text.isEmpty())
                        {
                                emit messageLogged(text);
                        }