diff --git a/LameXP.vcproj b/LameXP.vcproj
index b3aab64b..766fea23 100644
--- a/LameXP.vcproj
+++ b/LameXP.vcproj
@@ -1785,6 +1785,16 @@
+
+
+
@@ -1795,6 +1805,16 @@
Outputs=""$(SolutionDir)tmp\RCC_$(SafeInputName).cpp""
/>
+
+
+
Updated Qt runtime libraries to v4.7.2
Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2
Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
+Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0
Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0
Updated language files (big thank-you to all contributors !!!)
Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 06528364..59fc670f 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1209,6 +1209,18 @@
The LameXP shell integration has been re-enabled.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 24f2646e..9af04677 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1210,6 +1210,18 @@
We recommend using %1 for that purpose.
Es wird empfohlen %1 für diesen Zweck zu verwenden.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 1b7fcc0b..69355d9b 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1209,6 +1209,18 @@
Sorry, LameXP cannot extract audio tracks from an Audio−CD at present.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 7f33cec1..521e55fc 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1218,6 +1218,18 @@ Sélection automatique (par défaut)
Sorry, LameXP cannot extract audio tracks from an Audio−CD at present.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 14dcd6b9..0b86608e 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1210,6 +1210,18 @@
Sorry, LameXP cannot extract audio tracks from an Audio−CD at present.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index ad1df0ae..d6acc114 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1212,6 +1212,18 @@
Sorry, LameXP cannot extract audio tracks from an Audio−CD at present.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 97c19ebb..3e03e004 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1209,6 +1209,18 @@
Sorry, LameXP cannot extract audio tracks from an Audio−CD at present.
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
MetaInfo
diff --git a/res/Tools.qrc b/res/Tools.qrc
index 5c77b925..32db05d3 100644
--- a/res/Tools.qrc
+++ b/res/Tools.qrc
@@ -20,7 +20,7 @@
tools/shorten.exe
tools/sox.exe
tools/speexdec.exe
- tools/ttaenc.exe
+ tools/tta.exe
tools/valdec.exe
tools/wget.exe
tools/wupdate.exe
diff --git a/res/tools/tta.exe b/res/tools/tta.exe
new file mode 100644
index 00000000..7ff6b461
Binary files /dev/null and b/res/tools/tta.exe differ
diff --git a/res/tools/ttaenc.exe b/res/tools/ttaenc.exe
deleted file mode 100644
index 685d176c..00000000
Binary files a/res/tools/ttaenc.exe and /dev/null differ
diff --git a/src/Config.h b/src/Config.h
index 75d475d6..125b9fdb 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 1
-#define VER_LAMEXP_BUILD 377
+#define VER_LAMEXP_BUILD 378
#define VER_LAMEXP_SUFFIX Beta-9
/*
diff --git a/src/Decoder_TTA.cpp b/src/Decoder_TTA.cpp
index a598f4dd..8f84e6e0 100644
--- a/src/Decoder_TTA.cpp
+++ b/src/Decoder_TTA.cpp
@@ -30,7 +30,7 @@
TTADecoder::TTADecoder(void)
:
- m_binary(lamexp_lookup_tool("ttaenc.exe"))
+ m_binary(lamexp_lookup_tool("tta.exe"))
{
if(m_binary.isEmpty())
{
@@ -48,8 +48,8 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
QStringList args;
args << "-d";
- args << "-o" << QDir::toNativeSeparators(outputFile);
args << QDir::toNativeSeparators(sourceFile);
+ args << QDir::toNativeSeparators(outputFile);
if(!startProcess(process, m_binary, args))
{
@@ -59,8 +59,7 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
bool bTimeout = false;
bool bAborted = false;
- //The TTA Decoder doesn't actually send any status updates :-[
- emit statusUpdated(20 + (QUuid::createUuid().data1 % 80));
+ QRegExp regExp("Progress: (\\d+)%");
while(process.state() != QProcess::NotRunning)
{
@@ -84,7 +83,13 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
{
QByteArray line = process.readLine();
QString text = QString::fromUtf8(line.constData()).simplified();
- if(!text.isEmpty())
+ if(regExp.lastIndexIn(text) >= 0)
+ {
+ bool ok = false;
+ int progress = regExp.cap(1).toInt(&ok);
+ if(ok) emit statusUpdated(progress);
+ }
+ else if(!text.isEmpty())
{
emit messageLogged(text);
}
diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index e2fc8bf0..2f7a961a 100644
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -353,7 +353,7 @@ void AboutDialog::showMoreAbout(void)
moreAboutText += makeToolText
(
tr("The True Audio − Lossless Audio Codec"),
- "ttaenc.exe", "v?.?.?",
+ "tta.exe", "v?.?",
tr("Released under the terms of the GNU Lesser General Public License."),
"http://tta.sourceforge.net/"
);
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index e4838c7a..2c7922e6 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -66,7 +66,7 @@ g_lamexp_tools[] =
{"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361},
{"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431},
{"8671e16497a2d217d3707d4aa418678d02b16bcc", "speexdec.exe", 12},
- {"d6e0de1e7a2d9dee10d06ae0b6b4f93b63205920", "ttaenc.exe", 341},
+ {"093bfdec22872ca99e40183937c88785468be989", "tta.exe", 21},
{"8c842eef65248b46fa6cb9a9e5714f575672d999", "valdec.exe", 31},
{"62e2805d1b2eb2a4d86a5ca6e6ea58010d05d2a7", "wget.exe", 1114},
{"a7e8aad52213e339ad985829722f35eab62be182", "wupdate.exe", UINT_MAX},