///////////////////////////////////////////////////////////////////////////////
// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 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
static const char* s_description = "Monkey's Audio (MAC)";
return s_description;
}
+
+ virtual const char *extension(void) const
+ {
+ static const char* s_extension = "ape";
+ return s_extension;
+ }
+
+ virtual bool isResamplingSupported(void) const
+ {
+ return false;
+ }
}
static const g_macEncoderInfo;
MACEncoder::MACEncoder(void)
:
- m_binary_enc(lamexp_tools_lookup("mac.exe")),
- m_binary_tag(lamexp_tools_lookup("tag.exe"))
+ m_binary_enc(lamexp_tools_lookup(L1S("mac.exe"))),
+ m_binary_tag(lamexp_tools_lookup(L1S("tag.exe")))
{
if(m_binary_enc.isEmpty() || m_binary_tag.isEmpty())
{
{
}
-bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
+bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, QAtomicInt &abortFlag)
{
QProcess process;
QStringList args;
return false;
}
- bool bTimeout = false;
- bool bAborted = false;
int prevProgress = -1;
+ QRegExp regExp(L1S("Progress: (\\d+).(\\d+)%"));
- QRegExp regExp("Progress: (\\d+).(\\d+)%");
-
- while(process.state() != QProcess::NotRunning)
+ const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, ®Exp](const QString &text)
{
- if(*abortFlag)
- {
- process.kill();
- bAborted = true;
- emit messageLogged("\nABORTED BY USER !!!");
- break;
- }
- process.waitForReadyRead(m_processTimeoutInterval);
- if(!process.bytesAvailable() && process.state() == QProcess::Running)
+ if (regExp.lastIndexIn(text) >= 0)
{
- process.kill();
- qWarning("MAC process timed out <-- killing!");
- emit messageLogged("\nPROCESS TIMEOUT !!!");
- bTimeout = true;
- break;
- }
- while(process.bytesAvailable() > 0)
- {
- QByteArray line = process.readLine();
- QString text = QString::fromUtf8(line.constData()).simplified();
- if(regExp.lastIndexIn(text) >= 0)
+ qint32 newProgress;
+ if (MUtils::regexp_parse_int32(regExp, newProgress))
{
- bool ok = false;
- int progress = regExp.cap(1).toInt(&ok);
- if(ok && (progress > prevProgress))
+ if (newProgress > prevProgress)
{
- emit statusUpdated(progress);
- prevProgress = qMin(progress + 2, 99);
+ emit statusUpdated(newProgress);
+ prevProgress = NEXT_PROGRESS(newProgress);
}
}
- else if(!text.isEmpty())
- {
- emit messageLogged(text);
- }
+ return true;
}
- }
+ return false;
+ });
- process.waitForFinished();
- if(process.state() != QProcess::NotRunning)
+ if(result != RESULT_SUCCESS)
{
- process.kill();
- process.waitForFinished(-1);
+ return false;
}
-
- emit statusUpdated(100);
- emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
- if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
+ if(metaInfo.empty(true))
{
- return false;
+ return true;
}
- emit messageLogged("\n-------------------------------\n");
+ emit messageLogged(L1S("\n-------------------------------\n"));
args.clear();
- args << "APE2" << QDir::toNativeSeparators(outputFile);
+ args << L1S("APE2") << QDir::toNativeSeparators(outputFile);
- if(!metaInfo.title().isEmpty()) args << QString("Title=%1").arg(cleanTag(metaInfo.title()));
- if(!metaInfo.artist().isEmpty()) args << QString("Artist=%1").arg(cleanTag(metaInfo.artist()));
- if(!metaInfo.album().isEmpty()) args << QString("Album=%1").arg(cleanTag(metaInfo.album()));
- if(!metaInfo.genre().isEmpty()) args << QString("Genre=%1").arg(cleanTag(metaInfo.genre()));
+ if(!metaInfo.title().isEmpty()) args << QString("Title=%1").arg(cleanTag(metaInfo.title()));
+ if(!metaInfo.artist().isEmpty()) args << QString("Artist=%1").arg(cleanTag(metaInfo.artist()));
+ if(!metaInfo.album().isEmpty()) args << QString("Album=%1").arg(cleanTag(metaInfo.album()));
+ if(!metaInfo.genre().isEmpty()) args << QString("Genre=%1").arg(cleanTag(metaInfo.genre()));
if(!metaInfo.comment().isEmpty()) args << QString("Comment=%1").arg(cleanTag(metaInfo.comment()));
- if(metaInfo.year()) args << QString("Year=%1").arg(QString::number(metaInfo.year()));
- if(metaInfo.position()) args << QString("Track=%1").arg(QString::number(metaInfo.position()));
+ if(metaInfo.year()) args << QString("Year=%1").arg(QString::number(metaInfo.year()));
+ if(metaInfo.position()) args << QString("Track=%1").arg(QString::number(metaInfo.position()));
//if(!metaInfo.cover().isEmpty()) args << QString("-add-cover:%1:%2").arg("front", metaInfo.cover());
return false;
}
- bTimeout = false;
-
- while(process.state() != QProcess::NotRunning)
- {
- if(*abortFlag)
- {
- process.kill();
- bAborted = true;
- emit messageLogged("\nABORTED BY USER !!!");
- break;
- }
- process.waitForReadyRead(m_processTimeoutInterval);
- if(!process.bytesAvailable() && process.state() == QProcess::Running)
- {
- process.kill();
- qWarning("Tag process timed out <-- killing!");
- emit messageLogged("\nPROCESS TIMEOUT !!!");
- bTimeout = true;
- break;
- }
- while(process.bytesAvailable() > 0)
- {
- QByteArray line = process.readLine();
- QString text = QString::fromUtf8(line.constData()).simplified();
- if(!text.isEmpty())
- {
- emit messageLogged(text);
- }
- }
- }
-
- process.waitForFinished();
- if(process.state() != QProcess::NotRunning)
- {
- process.kill();
- process.waitForFinished(-1);
- }
-
- emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
-
- if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
- {
- return false;
- }
-
- return true;
-}
-
-QString MACEncoder::extension(void)
-{
- return "ape";
+ return (awaitProcess(process, abortFlag) == RESULT_SUCCESS);
}
bool MACEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
{
- if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
+ if(containerType.compare(L1S("Wave"), Qt::CaseInsensitive) == 0)
{
- if(formatType.compare("PCM", Qt::CaseInsensitive) == 0)
+ if(formatType.compare(L1S("PCM"), Qt::CaseInsensitive) == 0)
{
return true;
}
OSDN Git Service
