Updated project file for VS2010.

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

diff --git a/src/Decoder_AAC.cpp b/src/Decoder_AAC.cpp
index c6915e1..3d3ac3b 100644 (file)
--- a/src/Decoder_AAC.cpp
+++ b/src/Decoder_AAC.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,19 +22,24 @@
 
 #include "Decoder_AAC.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
 AACDecoder::AACDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("faad.exe"))
+       m_binary(lamexp_tools_lookup("faad.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing AAC decoder. Tool 'faad.exe' is not registred!";
+               MUTILS_THROW("Error initializing AAC decoder. Tool 'faad.exe' is not registred!");
        }
 }
 
@@ -104,7 +110,7 @@ bool AACDecoder::decode(const QString &sourceFile, const QString &outputFile, vo
        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;
        }
@@ -132,7 +138,18 @@ bool AACDecoder::isFormatSupported(const QString &containerType, const QString &
        return false;
 }
 
-QStringList AACDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *AACDecoder::supportedTypes(void)
 {
-       return QStringList() << "Advanced Audio Coding (*.aac *.mp4 *.m4a)";
+       static const char *exts[] =
+       {
+               "mp4", "m4a", "aac", NULL
+       };
+
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "Advanced Audio Coding", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
 }