Updated Simplified Chinese translation, thanks to Hongchuan Zhuang <kidneybean@sohu...

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

diff --git a/src/Decoder_Vorbis.cpp b/src/Decoder_Vorbis.cpp
index 1faca43..3b6bf02 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-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.
+// (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
@@ -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_tools_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!");
        }
 }
 
@@ -41,7 +47,7 @@ VorbisDecoder::~VorbisDecoder(void)
 {
 }
 
-bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile, QAtomicInt &abortFlag)
 {
        QProcess process;
        QStringList args;
@@ -54,68 +60,36 @@ bool VorbisDecoder::decode(const QString &sourceFile, const QString &outputFile,
                return false;
        }
 
-       bool bTimeout = false;
-       bool bAborted = false;
-
-       QRegExp regExp(" (\\d+)% decoded.");
+       int prevProgress = -1;
+       QRegExp regExp("\\b(\\d+)\\.(\\d)%\\s+decoded.");
 
-       while(process.state() != QProcess::NotRunning)
+       const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
        {
-               if(*abortFlag)
-               {
-                       process.kill();
-                       bAborted = true;
-                       emit messageLogged("\nABORTED BY USER !!!");
-                       break;
-               }
-               process.waitForReadyRead();
-               if(!process.bytesAvailable() && process.state() == QProcess::Running)
-               {
-                       process.kill();
-                       qWarning("OggDec process timed out <-- killing!");
-                       bTimeout = true;
-                       break;
-               }
-               while(process.bytesAvailable() > 0)
+               if (regExp.lastIndexIn(text) >= 0)
                {
-                       QByteArray line = process.readLine();
-                       QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(regExp.lastIndexIn(text) >= 0)
+                       qint32 values[2];
+                       if (MUtils::regexp_parse_int32(regExp, values, 2))
                        {
-                               bool ok = false;
-                               int progress = regExp.cap(1).toInt(&ok);
-                               if(ok) emit statusUpdated(progress);
-                       }
-                       else if(!text.isEmpty())
-                       {
-                               emit messageLogged(text);
+                               const qint32 newProgress = (values[1] >= 5) ? (values[0] + 1) : values[0];
+                               if (newProgress > prevProgress)
+                               {
+                                       emit statusUpdated(newProgress);
+                                       prevProgress = NEXT_PROGRESS(newProgress);
+                               }
                        }
+                       return true;
                }
-       }
-
-       process.waitForFinished();
-       if(process.state() != QProcess::NotRunning)
-       {
-               process.kill();
-               process.waitForFinished(-1);
-       }
-       
-       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)
-       {
                return false;
-       }
+       });
        
-       return true;
+       return (result == RESULT_SUCCESS);
 }
 
-bool VorbisDecoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
+bool VorbisDecoder::isFormatSupported(const QString &containerType, const QString& /*containerProfile*/, const QString &formatType, const QString& /*formatProfile*/, const QString& /*formatVersion*/)
 {
-       if(containerType.compare("OGG", Qt::CaseInsensitive) == 0)
+       if(containerType.compare(QLatin1String("OGG"), Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("Vorbis", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(QLatin1String("Vorbis"), Qt::CaseInsensitive) == 0)
                {
                        return true;
                }
@@ -124,7 +98,18 @@ bool VorbisDecoder::isFormatSupported(const QString &containerType, const QStrin
        return false;
 }
 
-QStringList VorbisDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *VorbisDecoder::supportedTypes(void)
 {
-       return QStringList() << "Ogg Vorbis (*.ogg *.ogm)";
+       static const char *exts[] =
+       {
+               "ogg", "ogx", "ogm", NULL
+       };
+
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "Ogg Vorbis", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
 }