diff --git a/LameXP.vcproj b/LameXP.vcproj
index 238832e7..9baffc63 100644
--- a/LameXP.vcproj
+++ b/LameXP.vcproj
@@ -326,6 +326,10 @@
RelativePath=".\src\Decoder_Musepack.cpp"
>
+
+
@@ -578,6 +582,10 @@
RelativePath=".\src\Decoder_Musepack.h"
>
+
+
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 12c86f28..92c475a6 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -143,6 +143,10 @@
Freely available source code, simple SDK and non-restrictive licensing.
+
+ Shorten − Lossless Audio Compressor
+
+
The True Audio − Lossless Audio Codec
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 6ede39f7..976aaead 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -179,6 +179,10 @@
Musepack − Living Audio Compression
+
+ Shorten − Lossless Audio Compressor
+ Shorten − Verlustfreie Audio Kompression
+
AudioFileModel
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 2606af87..8db357a0 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -180,6 +180,10 @@
Musepack − Living Audio Compression
+
+ Shorten − Lossless Audio Compressor
+
+
AudioFileModel
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 8421fd36..b4730b6f 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -180,6 +180,10 @@
Musepack − Living Audio Compression
+
+ Shorten − Lossless Audio Compressor
+
+
AudioFileModel
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 5fb08409..89767bcf 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -179,6 +179,10 @@
Musepack − Living Audio Compression
+
+ Shorten − Lossless Audio Compressor
+
+
AudioFileModel
diff --git a/etc/Translation/update.lst b/etc/Translation/update.lst
index 3e5df4eb..fd7c5279 100644
--- a/etc/Translation/update.lst
+++ b/etc/Translation/update.lst
@@ -15,6 +15,7 @@
..\..\src\Decoder_MAC.cpp
..\..\src\Decoder_MP3.cpp
..\..\src\Decoder_Musepack.cpp
+..\..\src\Decoder_Shorten.cpp
..\..\src\Decoder_TTA.cpp
..\..\src\Decoder_Vorbis.cpp
..\..\src\Decoder_Wave.cpp
@@ -69,6 +70,7 @@
..\..\src\Decoder_MAC.h
..\..\src\Decoder_MP3.h
..\..\src\Decoder_Musepack.h
+..\..\src\Decoder_Shorten.h
..\..\src\Decoder_TTA.h
..\..\src\Decoder_Vorbis.h
..\..\src\Decoder_Wave.h
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index b280c986..0424a77d 100644
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/res/tools/shorten.exe b/res/tools/shorten.exe
index 04fa97a8..6ff5e6b6 100644
Binary files a/res/tools/shorten.exe and b/res/tools/shorten.exe differ
diff --git a/src/Config.h b/src/Config.h
index a8f7f125..5197914c 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 278
+#define VER_LAMEXP_BUILD 279
#define VER_LAMEXP_SUFFIX Beta-2
/*
diff --git a/src/Decoder_Shorten.cpp b/src/Decoder_Shorten.cpp
new file mode 100644
index 00000000..a539a026
--- /dev/null
+++ b/src/Decoder_Shorten.cpp
@@ -0,0 +1,127 @@
+///////////////////////////////////////////////////////////////////////////////
+// LameXP - Audio Encoder Front-End
+// Copyright (C) 2004-2011 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 "Decoder_Shorten.h"
+
+#include "Global.h"
+
+#include
+#include
+#include
+#include
+
+ShortenDecoder::ShortenDecoder(void)
+:
+ m_binary(lamexp_lookup_tool("shorten.exe"))
+{
+ if(m_binary.isEmpty())
+ {
+ throw "Error initializing WavPack decoder. Tool 'shorten.exe' is not registred!";
+ }
+}
+
+ShortenDecoder::~ShortenDecoder(void)
+{
+}
+
+bool ShortenDecoder::decode(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+{
+ QProcess process;
+ QStringList args;
+
+ args << "-x";
+ args << QDir::toNativeSeparators(sourceFile);
+ args << QDir::toNativeSeparators(outputFile);
+
+ if(!startProcess(process, m_binary, args))
+ {
+ return false;
+ }
+
+ bool bTimeout = false;
+ bool bAborted = false;
+
+ //The Shorten Decoder doesn't actually send any status updates :-[
+ emit statusUpdated(20 + (QUuid::createUuid().data1 % 80));
+
+ while(process.state() != QProcess::NotRunning)
+ {
+ if(*abortFlag)
+ {
+ process.kill();
+ bAborted = true;
+ emit messageLogged("\nABORTED BY USER !!!");
+ break;
+ }
+ process.waitForReadyRead(180000);
+ if(!process.bytesAvailable() && process.state() == QProcess::Running)
+ {
+ process.kill();
+ qWarning("MpcDec 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 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;
+}
+
+bool ShortenDecoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
+{
+ if(containerType.compare("Shorten", Qt::CaseInsensitive) == 0)
+ {
+ if(formatType.compare("Shorten", Qt::CaseInsensitive) == 0)
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+QStringList ShortenDecoder::supportedTypes(void)
+{
+ return QStringList() << "Shorten (*.shn)";
+}
diff --git a/src/Decoder_Shorten.h b/src/Decoder_Shorten.h
new file mode 100644
index 00000000..046b4637
--- /dev/null
+++ b/src/Decoder_Shorten.h
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+// LameXP - Audio Encoder Front-End
+// Copyright (C) 2004-2011 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 "Decoder_Abstract.h"
+
+class ShortenDecoder : public AbstractDecoder
+{
+public:
+ ShortenDecoder(void);
+ ~ShortenDecoder(void);
+
+ virtual bool decode(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag);
+ static bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
+ static QStringList supportedTypes(void);
+
+private:
+ const QString m_binary;
+};
diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index 4e093ce9..bc4d34c3 100644
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -326,6 +326,13 @@ void AboutDialog::showMoreAbout(void)
"http://www.monkeysaudio.com/"
);
moreAboutText += makeToolText
+ (
+ tr("Shorten − Lossless Audio Compressor"),
+ "shorten.exe", "v?.?.?",
+ tr("Released under the terms of the GNU Lesser General Public License."),
+ "http://etree.org/shnutils/shorten/"
+ );
+ moreAboutText += makeToolText
(
tr("The True Audio − Lossless Audio Codec"),
"ttaenc.exe", "v?.?.?",
diff --git a/src/Registry_Decoder.cpp b/src/Registry_Decoder.cpp
index 249b252f..ae70a580 100644
--- a/src/Registry_Decoder.cpp
+++ b/src/Registry_Decoder.cpp
@@ -29,6 +29,7 @@
#include "Decoder_MAC.h"
#include "Decoder_MP3.h"
#include "Decoder_Musepack.h"
+#include "Decoder_Shorten.h"
#include "Decoder_TTA.h"
#include "Decoder_Vorbis.h"
#include "Decoder_Wave.h"
@@ -51,6 +52,7 @@ AbstractDecoder *DecoderRegistry::lookup(const QString &containerType, const QSt
PROBE_DECODER(FLACDecoder);
PROBE_DECODER(WavPackDecoder);
PROBE_DECODER(MusepackDecoder);
+ PROBE_DECODER(ShortenDecoder);
PROBE_DECODER(MACDecoder);
PROBE_DECODER(TTADecoder);
PROBE_DECODER(ALACDecoder);
@@ -73,6 +75,7 @@ QStringList DecoderRegistry::getSupportedTypes(void)
types << GET_FILETYPES(FLACDecoder);
types << GET_FILETYPES(WavPackDecoder);
types << GET_FILETYPES(MusepackDecoder);
+ types << GET_FILETYPES(ShortenDecoder);
types << GET_FILETYPES(MACDecoder);
types << GET_FILETYPES(TTADecoder);
types << GET_FILETYPES(ALACDecoder);
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index bdf8344d..398637f0 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -63,7 +63,7 @@ g_lamexp_tools[] =
{"ecd15abe103184aca96e406f5f1c82c6fb2e665d", "oggenc2_i386.exe", 287},
{"ffe0fbd73352396dc3752ac9d484dbfc754a226d", "oggenc2_sse2.exe", 287},
{"a8c50872e544a55495a824426e9378984f2ae01d", "oggenc2_x64.exe", 287},
- {"ffeaa70bd6321185eafcb067ab2dc441650038bf", "shorten.exe", UINT_MAX},
+ {"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361},
{"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431},
{"346ce516281c97e92e1b8957ddeca52edcf2d056", "speexdec.exe", UINT_MAX},
{"8a74b767cfe88bf88c068fdae0de02d65589d25e", "takc.exe", UINT_MAX},