Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-03-19 20:44:00 +01:00
parent f12aec1e2f
commit 282b4cb538
16 changed files with 119 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
LameXP.vcproj
View File

@ -1785,6 +1785,16 @@
<File <File
RelativePath=".\res\Documents.qrc" RelativePath=".\res\Documents.qrc"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="RCC &quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -o &quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot; -name &quot;$(SafeInputName)&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Release|Win32"
> >
@ -1795,6 +1805,16 @@
Outputs="&quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;" Outputs="&quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="RCC &quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;"
CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -o &quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot; -name &quot;$(SafeInputName)&quot; &quot;$(InputPath)&quot;"
Outputs="&quot;$(SolutionDir)tmp\RCC_$(SafeInputName).cpp&quot;"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath=".\res\Flags.qrc" RelativePath=".\res\Flags.qrc"

1
doc/Changelog.html
View File

@ -14,6 +14,7 @@
<li>Updated Qt runtime libraries to v4.7.2 <li>Updated Qt runtime libraries to v4.7.2
<li>Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2 <li>Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2
<li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
<li>Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0
<li>Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0 <li>Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0
<li>Updated language files (big thank-you to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly) <li>Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)

12
etc/Translation/Blank.ts
View File

@ -1209,6 +1209,18 @@
<source>The LameXP shell integration has been re-enabled.</source> <source>The LameXP shell integration has been re-enabled.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_DE.ts
View File

@ -1210,6 +1210,18 @@
<source>We recommend using %1 for that purpose.</source> <source>We recommend using %1 for that purpose.</source>
<translation>Es wird empfohlen %1 für diesen Zweck zu verwenden.</translation> <translation>Es wird empfohlen %1 für diesen Zweck zu verwenden.</translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_ES.ts
View File

@ -1209,6 +1209,18 @@
<source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source> <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_FR.ts
View File

@ -1218,6 +1218,18 @@ Sélection automatique (par défaut)</translation>
<source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source> <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_IT.ts
View File

@ -1210,6 +1210,18 @@
<source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source> <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_RU.ts
View File

@ -1212,6 +1212,18 @@
<source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source> <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

12
etc/Translation/LameXP_UK.ts
View File

@ -1209,6 +1209,18 @@
<source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source> <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Frequently Asked Questions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changelog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translator&apos;s Guide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MetaInfo</name> <name>MetaInfo</name>

2
res/Tools.qrc
View File

@ -20,7 +20,7 @@
<file>tools/shorten.exe</file> <file>tools/shorten.exe</file>
<file>tools/sox.exe</file> <file>tools/sox.exe</file>
<file>tools/speexdec.exe</file> <file>tools/speexdec.exe</file>
<file>tools/ttaenc.exe</file> <file>tools/tta.exe</file>
<file>tools/valdec.exe</file> <file>tools/valdec.exe</file>
<file>tools/wget.exe</file> <file>tools/wget.exe</file>
<file>tools/wupdate.exe</file> <file>tools/wupdate.exe</file>

BIN
res/tools/tta.exe Normal file
View File

Binary file not shown.

BIN
res/tools/ttaenc.exe
View File

Binary file not shown.

2
src/Config.h
View File

@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_BUILD 377 #define VER_LAMEXP_BUILD 378
#define VER_LAMEXP_SUFFIX Beta-9 #define VER_LAMEXP_SUFFIX Beta-9
/* /*

15
src/Decoder_TTA.cpp
View File

@ -30,7 +30,7 @@
TTADecoder::TTADecoder(void) TTADecoder::TTADecoder(void)
: :
m_binary(lamexp_lookup_tool("ttaenc.exe")) m_binary(lamexp_lookup_tool("tta.exe"))
{ {
if(m_binary.isEmpty()) if(m_binary.isEmpty())
{ {
@ -48,8 +48,8 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
QStringList args; QStringList args;
args << "-d"; args << "-d";
args << "-o" << QDir::toNativeSeparators(outputFile);
args << QDir::toNativeSeparators(sourceFile); args << QDir::toNativeSeparators(sourceFile);
args << QDir::toNativeSeparators(outputFile);
if(!startProcess(process, m_binary, args)) if(!startProcess(process, m_binary, args))
{ {
@ -59,8 +59,7 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
bool bTimeout = false; bool bTimeout = false;
bool bAborted = false; bool bAborted = false;
//The TTA Decoder doesn't actually send any status updates :-[ QRegExp regExp("Progress: (\\d+)%");
emit statusUpdated(20 + (QUuid::createUuid().data1 % 80));
while(process.state() != QProcess::NotRunning) while(process.state() != QProcess::NotRunning)
{ {
@ -84,7 +83,13 @@ bool TTADecoder::decode(const QString &sourceFile, const QString &outputFile, vo
{ {
QByteArray line = process.readLine(); QByteArray line = process.readLine();
QString text = QString::fromUtf8(line.constData()).simplified(); 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); emit messageLogged(text);
} }

2
src/Dialog_About.cpp
View File

@ -353,7 +353,7 @@ void AboutDialog::showMoreAbout(void)
moreAboutText += makeToolText moreAboutText += makeToolText
( (
tr("The True Audio &minus; Lossless Audio Codec"), tr("The True Audio &minus; Lossless Audio Codec"),
"ttaenc.exe", "v?.?.?", "tta.exe", "v?.?",
tr("Released under the terms of the GNU Lesser General Public License."), tr("Released under the terms of the GNU Lesser General Public License."),
"http://tta.sourceforge.net/" "http://tta.sourceforge.net/"
); );

2
src/Thread_Initialization.cpp
View File

@ -66,7 +66,7 @@ g_lamexp_tools[] =
{"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361}, {"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361},
{"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431}, {"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431},
{"8671e16497a2d217d3707d4aa418678d02b16bcc", "speexdec.exe", 12}, {"8671e16497a2d217d3707d4aa418678d02b16bcc", "speexdec.exe", 12},
{"d6e0de1e7a2d9dee10d06ae0b6b4f93b63205920", "ttaenc.exe", 341}, {"093bfdec22872ca99e40183937c88785468be989", "tta.exe", 21},
{"8c842eef65248b46fa6cb9a9e5714f575672d999", "valdec.exe", 31}, {"8c842eef65248b46fa6cb9a9e5714f575672d999", "valdec.exe", 31},
{"62e2805d1b2eb2a4d86a5ca6e6ea58010d05d2a7", "wget.exe", 1114}, {"62e2805d1b2eb2a4d86a5ca6e6ea58010d05d2a7", "wget.exe", 1114},
{"a7e8aad52213e339ad985829722f35eab62be182", "wupdate.exe", UINT_MAX}, {"a7e8aad52213e339ad985829722f35eab62be182", "wupdate.exe", UINT_MAX},