diff --git a/res/tools/faad.exe b/res/tools/faad.exe index 5e922bfa..249b05f7 100644 Binary files a/res/tools/faad.exe and b/res/tools/faad.exe differ diff --git a/src/Config.h b/src/Config.h index 039b3086..88ea89cd 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 114 +#define VER_LAMEXP_BUILD 115 #define VER_LAMEXP_SUFFIX TechPreview /* diff --git a/src/Decoder_AAC.cpp b/src/Decoder_AAC.cpp index 5bd6c59d..c8d5b153 100644 --- a/src/Decoder_AAC.cpp +++ b/src/Decoder_AAC.cpp @@ -46,8 +46,8 @@ bool AACDecoder::decode(const QString &sourceFile, const QString &outputFile, vo QProcess process; QStringList args; - args << "-o" << pathToShort(QDir::toNativeSeparators(outputFile)); - args << pathToShort(QDir::toNativeSeparators(sourceFile)); + args << "-o" << QDir::toNativeSeparators(outputFile); + args << QDir::toNativeSeparators(sourceFile); if(!startProcess(process, m_binary, args)) { @@ -57,7 +57,7 @@ bool AACDecoder::decode(const QString &sourceFile, const QString &outputFile, vo bool bTimeout = false; bool bAborted = false; - QRegExp regExp("[^\\w](\\d+)%\\s+decoding\\s+"); + QRegExp regExp("\\[(\\d+)%\\]\\s+decoding\\s+"); while(process.state() != QProcess::NotRunning) { diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index b8e561af..01b5dc24 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -41,7 +41,7 @@ struct lamexp_tool_t static const struct lamexp_tool_t g_lamexp_tools[] = { {"153f4274702f3629093b561a31dbf50e2c146305", "alac.exe"}, - {"fb4fc54913672d8167fed367280bc5d39cf16a27", "faad.exe"}, + {"610bd36eb882666f89e3939ec4d928d13b60b63f", "faad.exe"}, {"070bf98f78e572a97e4703ef5720c682567a6a56", "flac.exe"}, {"cf379081035ae6bfb6f7bc22f13bfb7ac6302ac5", "gpgv.exe"}, {"d837bf6ee4dab557d8b02d46c75a24e58980fffa", "gpgv.gpg"},