Updated Monkey's Audio binaries to v10.36 (2023-12-17), compiled with ICL 2024.0...

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

diff --git a/src/Decoder_AC3.cpp b/src/Decoder_AC3.cpp
index 51bffa5..e5a4f37 100644 (file)
--- a/src/Decoder_AC3.cpp
+++ b/src/Decoder_AC3.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2017 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2023 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
+// 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, but always including the *additional*
-// restrictions defined in the "License.txt" file.
+// (at your option) any later version; always including the non-optional
+// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "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
@@ -67,15 +67,13 @@ bool AC3Decoder::decode(const QString &sourceFile, const QString &outputFile, QA
        {
                if (regExp.lastIndexIn(text) >= 0)
                {
-                       qWarning("Found! [\"%s\"]", MUTILS_UTF8(regExp.cap(1)));
                        qint32 newProgress;
                        if (MUtils::regexp_parse_int32(regExp, newProgress))
                        {
-                               qWarning("newProgress: %d", newProgress);
                                if (newProgress > prevProgress)
                                {
                                        emit statusUpdated(newProgress);
-                                       prevProgress = qMin(newProgress + 2, 99);
+                                       prevProgress = NEXT_PROGRESS(newProgress);
                                }
                        }
                        return true;
@@ -86,32 +84,34 @@ bool AC3Decoder::decode(const QString &sourceFile, const QString &outputFile, QA
        return (result == RESULT_SUCCESS);
 }
 
-bool AC3Decoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
+bool AC3Decoder::isFormatSupported(const QString &containerType, const QString& /*containerProfile*/, const QString &formatType, const QString& /*formatProfile*/, const QString& /*formatVersion*/)
 {
-       if(containerType.compare("AC-3", Qt::CaseInsensitive) == 0)
+       static const QLatin1String ac3("AC-3"), eac3("E-AC-3"), dts("DTS");
+       if(containerType.compare(ac3, Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("AC-3", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(ac3, Qt::CaseInsensitive) == 0)
                {
                        return true;
                }
        }
-       if(containerType.compare("E-AC-3", Qt::CaseInsensitive) == 0)
+       if(containerType.compare(eac3, Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("E-AC-3", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(eac3, Qt::CaseInsensitive) == 0)
                {
                        return true;
                }
        }
-       else if(containerType.compare("DTS", Qt::CaseInsensitive) == 0)
+
+       else if(containerType.compare(dts, Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("DTS", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(dts, Qt::CaseInsensitive) == 0)
                {
                        return true;
                }
        }
-       else if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
+       else if(containerType.compare(QLatin1String("Wave"), Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("AC-3", Qt::CaseInsensitive) == 0 || formatType.compare("E-AC-3", Qt::CaseInsensitive) == 0 || formatType.compare("DTS", Qt::CaseInsensitive) == 0)
+               if((formatType.compare(ac3, Qt::CaseInsensitive) == 0) || (formatType.compare(eac3, Qt::CaseInsensitive) == 0) || (formatType.compare(dts, Qt::CaseInsensitive) == 0))
                {
                        return true;
                }