diff --git a/LameXP.vcproj b/LameXP.vcproj
index abbdd456..e6d17ad5 100644
--- a/LameXP.vcproj
+++ b/LameXP.vcproj
@@ -302,10 +302,6 @@
RelativePath=".\src\Decoder_MP3.cpp"
>
-
-
@@ -342,6 +338,10 @@
RelativePath=".\src\Dialog_WorkingBanner.cpp"
>
+
+
@@ -470,6 +470,10 @@
/>
+
+
@@ -746,6 +750,40 @@
/>
+
+
+
+
+
+
+
+
+
+
+
@@ -1232,6 +1270,10 @@
RelativePath=".\tmp\MOC_Dialog_WorkingBanner.cpp"
>
+
+
diff --git a/src/Config.h b/src/Config.h
index 54d6a18e..404289b1 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0
-#define VER_LAMEXP_BUILD 117
+#define VER_LAMEXP_BUILD 120
#define VER_LAMEXP_SUFFIX TechPreview
/*
diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index 35197d2f..98c54254 100644
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -76,7 +76,7 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta
aboutText += "This software uses the 'slick' icon set by Mark James – http://www.famfamfam.com/.
";
aboutText += "Released under the Creative Commons Attribution 2.5 License.
";
aboutText += "
";
- aboutText += QString("Special thanks go out to \"John33\" from %1 for his continuous support.
").arg(LINK("http://www.RareWares.org/"));
+ aboutText += QString("Special thanks go out to \"John33\" from %1 for his continuous support.
").arg(LINK("http://www.rarewares.org/"));
setText(aboutText);
setIconPixmap(dynamic_cast(QApplication::instance())->windowIcon().pixmap(QSize(64,64)));
@@ -185,9 +185,9 @@ void AboutDialog::showAboutQt(void)
void AboutDialog::showAboutContributors(void)
{
QString contributorsAboutText;
- contributorsAboutText += "People who have contributed to LameXP:
";
+ contributorsAboutText += "The following people have contributed to LameXP:
";
contributorsAboutText += "Translators:";
- contributorsAboutText += "";
+ contributorsAboutText += "";
contributorsAboutText += CONTRIBUTOR("Englisch", "LoRd_MuldeR <MuldeR2@GMX.de>", ":/flags/gb.png");
contributorsAboutText += CONTRIBUTOR("Deutsch", "LoRd_MuldeR <MuldeR2@GMX.de>", ":/flags/de.png");
contributorsAboutText += "
";
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index b229e7be..be23342d 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -498,7 +498,7 @@ void MainWindow::windowShown(void)
QDate lastUpdateCheck = QDate::fromString(m_settings->autoUpdateLastCheck(), Qt::ISODate);
if(!lastUpdateCheck.isValid() || QDate::currentDate() >= lastUpdateCheck.addDays(14))
{
- if(QMessageBox::information(this, "Update Reminer", "Your last update check was more than 14 days ago. Check for updates now?", "Check for Updates", "Defer") == 0)
+ if(QMessageBox::information(this, "Update Reminer", (lastUpdateCheck.isValid() ? "Your last update check was more than 14 days ago. Check for updates now?" : "Your did not check for LameXP updates yet. Check for updates now?"), "Check for Updates", "Defer") == 0)
{
checkUpdatesActionActivated();
}
@@ -571,9 +571,9 @@ void MainWindow::encodeButtonClicked(void)
return;
}
- if(m_settings->compressionEncoder() != SettingsModel::MP3Encoder && m_settings->compressionEncoder() != SettingsModel::VorbisEncoder)
+ if(m_settings->compressionEncoder() != SettingsModel::MP3Encoder && m_settings->compressionEncoder() != SettingsModel::VorbisEncoder && m_settings->compressionEncoder() != SettingsModel::AACEncoder)
{
- QMessageBox::warning(this, "LameXP", "Sorry, only Lame MP3 and Ogg Vorbis encoding is supported at the moment.
Support for more encoders in later versions!");
+ QMessageBox::warning(this, "LameXP", "Sorry, only MP3, Vorbis and AAC encoding is supported at the moment.
Support for more encoders to be added in later versions!");
tabWidget->setCurrentIndex(3);
return;
}
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index 0550ae0e..352c73a1 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -30,6 +30,7 @@
#include "Dialog_LogView.h"
#include "Encoder_MP3.h"
#include "Encoder_Vorbis.h"
+#include "Encoder_AAC.h"
#include
#include
@@ -392,6 +393,14 @@ void ProcessingDialog::startNextJob(void)
encoder = vorbisEncoder;
}
break;
+ case SettingsModel::AACEncoder:
+ {
+ AACEncoder *aacEncoder = new AACEncoder();
+ aacEncoder->setBitrate(m_settings->compressionBitrate());
+ aacEncoder->setRCMode(m_settings->compressionRCMode());
+ encoder = aacEncoder;
+ }
+ break;
default:
throw "Unsupported encoder!";
}
diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp
new file mode 100644
index 00000000..a9551f66
--- /dev/null
+++ b/src/Encoder_AAC.cpp
@@ -0,0 +1,237 @@
+///////////////////////////////////////////////////////////////////////////////
+// LameXP - Audio Encoder Front-End
+// Copyright (C) 2004-2010 LoRd_MuldeR
+//
+// 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// http://www.gnu.org/licenses/gpl-2.0.txt
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Encoder_AAC.h"
+
+#include "Global.h"
+#include "Model_Settings.h"
+
+#include
+#include
+
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define IS_UNICODE(STR) (qstricmp(STR.toUtf8().constData(), QString::fromLocal8Bit(STR.toLocal8Bit()).toUtf8().constData()))
+
+AACEncoder::AACEncoder(void)
+:
+ m_binary_enc(lamexp_lookup_tool("neroAacEnc.exe")),
+ m_binary_tag(lamexp_lookup_tool("neroAacTag.exe"))
+{
+ if(m_binary_enc.isEmpty() || m_binary_tag.isEmpty())
+ {
+ throw "Error initializing AAC encoder. Tool 'neroAacEnc.exe' is not registred!";
+ }
+}
+
+AACEncoder::~AACEncoder(void)
+{
+}
+
+bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag)
+{
+ QProcess process;
+ QStringList args;
+ const QString baseName = QFileInfo(outputFile).fileName();
+
+ switch(m_configRCMode)
+ {
+ case SettingsModel::VBRMode:
+ args << "-q" << QString().sprintf("%.2f", min(1.0, max(0.0, static_cast(m_configBitrate * 5) / 100.0)));
+ break;
+ case SettingsModel::ABRMode:
+ args << "-br" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000) << "-2pass";
+ break;
+ case SettingsModel::CBRMode:
+ args << "-cbr" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000) << "-2pass";
+ break;
+ default:
+ throw "Bad rate-control mode!";
+ break;
+ }
+
+ args << "-if" << QDir::toNativeSeparators(sourceFile);
+ args << "-of" << QDir::toNativeSeparators(outputFile);
+
+ if(!startProcess(process, m_binary_enc, args))
+ {
+ return false;
+ }
+
+ bool bTimeout = false;
+ bool bAborted = false;
+
+ QRegExp regExp("Processed\\s+(\\d+)\\s+seconds");
+ QRegExp regExp_pass1("First\\s+pass:\\s+processed\\s+(\\d+)\\s+seconds");
+ QRegExp regExp_pass2("Second\\s+pass:\\s+processed\\s+(\\d+)\\s+seconds");
+
+ while(process.state() != QProcess::NotRunning)
+ {
+ if(*abortFlag)
+ {
+ process.kill();
+ bAborted = true;
+ emit messageLogged("\nABORTED BY USER !!!");
+ break;
+ }
+ process.waitForReadyRead();
+ if(!process.bytesAvailable() && process.state() == QProcess::Running)
+ {
+ process.kill();
+ qWarning("NeroAacEnc process timed out <-- killing!");
+ bTimeout = true;
+ break;
+ }
+ while(process.bytesAvailable() > 0)
+ {
+ QByteArray line = process.readLine();
+ QString text = QString::fromUtf8(line.constData()).simplified();
+ if(regExp_pass1.lastIndexIn(text) >= 0)
+ {
+ bool ok = false;
+ int progress = regExp_pass1.cap(1).toInt(&ok);
+ if(ok && metaInfo.fileDuration() > 0)
+ {
+ emit statusUpdated(static_cast((static_cast(progress) / static_cast(metaInfo.fileDuration())) * 50.0));
+ }
+ }
+ else if(regExp_pass2.lastIndexIn(text) >= 0)
+ {
+ bool ok = false;
+ int progress = regExp_pass2.cap(1).toInt(&ok);
+ if(ok && metaInfo.fileDuration() > 0)
+ {
+ emit statusUpdated(static_cast((static_cast(progress) / static_cast(metaInfo.fileDuration())) * 50.0) + 50);
+ }
+ }
+ else if(regExp.lastIndexIn(text) >= 0)
+ {
+ bool ok = false;
+ int progress = regExp.cap(1).toInt(&ok);
+ if(ok && metaInfo.fileDuration() > 0)
+ {
+ emit statusUpdated(static_cast((static_cast(progress) / static_cast(metaInfo.fileDuration())) * 100.0));
+ }
+ }
+ else if(!text.isEmpty())
+ {
+ emit messageLogged(text);
+ }
+ }
+ }
+
+ 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)
+ {
+ return false;
+ }
+
+ emit messageLogged("\n-------------------------------\n");
+
+ args.clear();
+ args << QDir::toNativeSeparators(outputFile);
+
+ if(!metaInfo.fileName().isEmpty()) args << QString("-meta:title=%1").arg(metaInfo.fileName());
+ if(!metaInfo.fileArtist().isEmpty()) args << QString("-meta:artist=%1").arg(metaInfo.fileArtist());
+ if(!metaInfo.fileAlbum().isEmpty()) args << QString("-meta:album=%1").arg(metaInfo.fileAlbum());
+ if(!metaInfo.fileGenre().isEmpty()) args << QString("-meta:genre=%1").arg(metaInfo.fileGenre());
+ if(!metaInfo.fileComment().isEmpty()) args << QString("-meta:comment=%1").arg(metaInfo.fileComment());
+ if(metaInfo.fileYear()) args << QString("-meta:year=%1").arg(QString::number(metaInfo.fileYear()));
+ if(metaInfo.filePosition()) args << QString("-meta:track=%1").arg(QString::number(metaInfo.filePosition()));
+
+ if(!startProcess(process, m_binary_tag, args))
+ {
+ return false;
+ }
+
+ bTimeout = false;
+
+ while(process.state() != QProcess::NotRunning)
+ {
+ if(*abortFlag)
+ {
+ process.kill();
+ bAborted = true;
+ emit messageLogged("\nABORTED BY USER !!!");
+ break;
+ }
+ process.waitForReadyRead();
+ if(!process.bytesAvailable() && process.state() == QProcess::Running)
+ {
+ process.kill();
+ qWarning("NeroAacTag process timed out <-- killing!");
+ 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.exitStatus() != QProcess::NormalExit)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+QString AACEncoder::extension(void)
+{
+ return "mp4";
+}
+
+bool AACEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
+{
+ if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
+ {
+ if(formatType.compare("PCM", Qt::CaseInsensitive) == 0)
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
diff --git a/src/Encoder_AAC.h b/src/Encoder_AAC.h
new file mode 100644
index 00000000..88e573c3
--- /dev/null
+++ b/src/Encoder_AAC.h
@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////
+// LameXP - Audio Encoder Front-End
+// Copyright (C) 2004-2010 LoRd_MuldeR
+//
+// 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// http://www.gnu.org/licenses/gpl-2.0.txt
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Encoder_Abstract.h"
+
+#include
+
+class AACEncoder : public AbstractEncoder
+{
+ Q_OBJECT
+
+public:
+ AACEncoder(void);
+ ~AACEncoder(void);
+
+ virtual bool encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag);
+ virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
+ virtual QString extension(void);
+
+private:
+ const QString m_binary_enc;
+ const QString m_binary_tag;
+};
diff --git a/src/LockedFile.cpp b/src/LockedFile.cpp
index 0f7a1523..119d105f 100644
--- a/src/LockedFile.cpp
+++ b/src/LockedFile.cpp
@@ -100,6 +100,9 @@ LockedFile::LockedFile(const QString &filePath)
throw error_msg;
}
+ //Remember file path
+ m_filePath = existingFile.canonicalFilePath();
+
//Now lock the file
m_fileHandle = CreateFileW(QWCHAR(QDir::toNativeSeparators(filePath)), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
diff --git a/src/Main.cpp b/src/Main.cpp
index b3c88a08..a2a1ee05 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -117,13 +117,15 @@ int lamexp_main(int argc, char* argv[])
FileListModel *fileListModel = new FileListModel();
AudioFileModel *metaInfo = new AudioFileModel();
SettingsModel *settingsModel = new SettingsModel();
- settingsModel->validate();
//Show splash screen
InitializationThread *poInitializationThread = new InitializationThread();
SplashScreen::showSplash(poInitializationThread);
LAMEXP_DELETE(poInitializationThread);
+ //Validate settings
+ settingsModel->validate();
+
//Create main window
MainWindow *poMainWindow = new MainWindow(fileListModel, metaInfo, settingsModel);
@@ -163,11 +165,18 @@ int lamexp_main(int argc, char* argv[])
int main(int argc, char* argv[])
{
+#ifdef _DEBUG
+ int iResult;
+ qInstallMsgHandler(lamexp_message_handler);
+ LAMEXP_MEMORY_CHECK(iResult = lamexp_main(argc, argv));
+ lamexp_finalization();
+ return iResult;
+#else
try
{
int iResult;
qInstallMsgHandler(lamexp_message_handler);
- LAMEXP_MEMORY_CHECK(iResult = lamexp_main(argc, argv));
+ iResult = lamexp_main(argc, argv);
lamexp_finalization();
return iResult;
}
@@ -195,4 +204,5 @@ int main(int argc, char* argv[])
FatalAppExit(0, L"Unhandeled exception error, application will exit!");
TerminateProcess(GetCurrentProcess(), -1);
}
+#endif
}
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index 6e45fa97..abb03175 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -98,7 +98,11 @@ void SettingsModel::validate(void)
}
if(!(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe")))
{
- if(this->compressionEncoder() == SettingsModel::AACEncoder) this->compressionEncoder(SettingsModel::MP3Encoder);
+ if(this->compressionEncoder() == SettingsModel::AACEncoder)
+ {
+ qWarning("Nero encoder selected, but not available any more. Reverting to MP3!");
+ this->compressionEncoder(SettingsModel::MP3Encoder);
+ }
}
if(this->outputDir().isEmpty() || !QFileInfo(this->outputDir()).isDir())
{