diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 99774b94..1a46ad8f 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -1236,7 +1236,7 @@ 0 0 - 602 + 604 1524 @@ -2095,6 +2095,11 @@ 0 + + + None + + Peak Level @@ -2105,11 +2110,6 @@ RMS Level - - - None - - diff --git a/res/tools/sox.exe b/res/tools/sox.exe index 1d8749d3..5702bacf 100644 Binary files a/res/tools/sox.exe and b/res/tools/sox.exe differ diff --git a/src/Config.h b/src/Config.h index 5feb87c1..0eab5d41 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 892 +#define VER_LAMEXP_BUILD 893 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Filter_Normalize.cpp b/src/Filter_Normalize.cpp index 4df6b640..db672756 100644 --- a/src/Filter_Normalize.cpp +++ b/src/Filter_Normalize.cpp @@ -48,7 +48,7 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile { QProcess process; QStringList args; - QString eqMode = (m_equalizationMode == 0) ? "-ne" : ((m_equalizationMode == 1) ? "-nb" : "-n"); + QString eqMode = (m_equalizationMode == 0) ? "-n" : ((m_equalizationMode == 1) ? "-ne" : "-nb"); process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath()); diff --git a/src/Global.cpp b/src/Global.cpp index 29b135d0..b03f24f9 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -477,6 +477,13 @@ void lamexp_message_handler(QtMsgType type, const char *msg) if(type == QtCriticalMsg || type == QtFatalMsg) { lock.unlock(); + + if(GetCurrentThreadId() != g_main_thread_id) + { + HANDLE mainThread = OpenThread(THREAD_TERMINATE, FALSE, g_main_thread_id); + if(mainThread) TerminateThread(mainThread, ULONG_MAX); + } + MessageBoxW(NULL, QWCHAR(QString::fromUtf8(msg)), L"LameXP - GURU MEDITATION", MB_ICONERROR | MB_TOPMOST | MB_TASKMODAL); FatalAppExit(0, L"The application has encountered a critical error and will exit now!"); TerminateProcess(GetCurrentProcess(), -1); diff --git a/src/Tools.h b/src/Tools.h index ff1df924..c85ec26b 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -74,7 +74,7 @@ g_lamexp_tools[] = {"693dd6f779df70a047c15c2c79350855db38d5b0cd7e529b6877b7c821cfe6addfdd50a4", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603}, {"291cedb6a1b213330a9cb508f975ee7132a25aa26770ab91cade50109b4ffb81c9bdd09a", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 287603}, {"58c2b8bcff8f27bfa8fab8172b80f5da731221d072c7dba4dd3a3d7d6423490a25dc6760", CPU_TYPE_ALL_ALL, "shorten.exe", 361}, - {"abdf9b20a8031a09d0abca9cb10c31c8418f72403b5d1350fd69bfa34041591aca3060ab", CPU_TYPE_ALL_ALL, "sox.exe", 1432}, + {"39b0a21f1491efa752acd37017903ff8cfc5b1031750e70d5efad6119af55a532673b779", CPU_TYPE_ALL_ALL, "sox.exe", 1440}, {"48e7f81c024cd17dac0eaeab253aad6b223e72dc80688f7576276b0563209514ff0bb9c8", CPU_TYPE_ALL_ALL, "speexdec.exe", 12}, {"9b50cf64747d4afbad5d8d9b5a0a2d41c5a58256f47ebdbd8cc920e7e576085dfe1b14ff", CPU_TYPE_ALL_ALL, "tta.exe", 21}, {"875871c942846f6ad163f9e4949bba2f4331bec678ca5aefe58c961b6825bd0d419a078b", CPU_TYPE_ALL_ALL, "valdec.exe", 31},