diff --git a/doc/Changelog.html b/doc/Changelog.html
index e43b561d..29e1a2a5 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -18,6 +18,7 @@ a:visited { color: #0000EE; }
Changes between v4.02 and v4.03:
- Added "built-in" WMA decoder (see this thread for details) and removed all remnants of "old" decoder
+
- Updated Qt runtime libraries to v4.8.0 Beta-1 (2011-07-19), compiled with MSVC 10.0
- Updated MediaInfo to v0.7.47 (2011-07-27), compiled with MSVC 10.0
- Updated language files (big thank-you to all contributors !!!)
- Fixed Cue Sheet import for tracks with certain characters in the title
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 9ae87d53..8b0ff585 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1041,10 +1041,6 @@
Disable Nero AAC Notifications
-
- Disable WMA Decoder Notifications
-
-
Show DropBox
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 97b6ac3b..34408097 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -754,10 +754,6 @@
Disable Nero AAC Notifications
Nero AAC-Meldungen deaktivieren
-
- Disable WMA Decoder Notifications
- WMA-Dekodierer-Meldungen deaktivieren
-
Show DropBox
DropBox anzeigen
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 86383a37..644b0185 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -757,10 +757,6 @@
Disable Nero AAC Notifications
Deshabilitar notificaciones de Nero AAC
-
- Disable WMA Decoder Notifications
- Deshabilitar notificaciones del decodificador WMA
-
Show DropBox
Mostar DropBox
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index de0280c7..7ec49351 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -762,10 +762,6 @@
Disable Nero AAC Notifications
Désactiver les notifications Nero AAC
-
- Disable WMA Decoder Notifications
- Désactiver les notifications du décodeur WMA
-
Show DropBox
Afficher la DropBox
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 7000ab05..0d80abe7 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -754,10 +754,6 @@
Disable Nero AAC Notifications
Disabilita le notifiche di Nero AAC
-
- Disable WMA Decoder Notifications
- Disabilita le notifiche del decoder WMA
-
Show DropBox
Mostra la DropBox
diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index 5f6b059e..e016849a 100644
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -949,10 +949,6 @@
Disable Nero AAC Notifications
Nero AAC 알림 비활성화
-
- Disable WMA Decoder Notifications
- WMA 디코더 알림 비활성화
-
Show DropBox
드롭박스 표시
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index a7496464..d6482ca5 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -924,10 +924,6 @@
Disable Nero AAC Notifications
Отключить сообщения Nero AAC
-
- Disable WMA Decoder Notifications
- Отключить сообщения WMA Decoder
-
Show DropBox
Показать DropBox
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 99220718..677087d0 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -902,10 +902,6 @@
Disable Nero AAC Notifications
Заборонити нагадування про Nero AAC
-
- Disable WMA Decoder Notifications
- Заборонити нагадування про декодер WMA
-
Show DropBox
Відображати DropBox
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index e01b9cef..cbcaebda 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -3269,14 +3269,6 @@
Disable Nero AAC Notifications
-
-
- true
-
-
- Disable WMA Decoder Notifications
-
-
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index 6e733c23..8a70a79d 100644
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm
index aa0dbad2..8f7b710b 100644
Binary files a/res/localization/LameXP_ES.qm and b/res/localization/LameXP_ES.qm differ
diff --git a/res/localization/LameXP_FR.qm b/res/localization/LameXP_FR.qm
index d7371fdb..cfebfe63 100644
Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ
diff --git a/res/localization/LameXP_IT.qm b/res/localization/LameXP_IT.qm
index 56c1837f..dd88aaa6 100644
Binary files a/res/localization/LameXP_IT.qm and b/res/localization/LameXP_IT.qm differ
diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm
index 42cd47c0..f32a6344 100644
Binary files a/res/localization/LameXP_KR.qm and b/res/localization/LameXP_KR.qm differ
diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm
index e2609af2..299a8fb9 100644
Binary files a/res/localization/LameXP_RU.qm and b/res/localization/LameXP_RU.qm differ
diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm
index 72c1b0b1..eba73b57 100644
Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ
diff --git a/src/Config.h b/src/Config.h
index 2e4b69e8..84265510 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Alpha
-#define VER_LAMEXP_PATCH 5
-#define VER_LAMEXP_BUILD 611
+#define VER_LAMEXP_PATCH 6
+#define VER_LAMEXP_BUILD 612
///////////////////////////////////////////////////////////////////////////////
// Tools versions
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 23914c2f..4d5f33c3 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -331,7 +331,6 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
actionDisableUpdateReminder->setChecked(!m_settings->autoUpdateEnabled());
actionDisableSounds->setChecked(!m_settings->soundsEnabled());
actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
- actionDisableWmaDecoderNotifications->setChecked(!m_settings->wmaDecoderNotificationsEnabled());
actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
actionDisableShellIntegration->setDisabled(lamexp_portable_mode() && actionDisableShellIntegration->isChecked());
diff --git a/src/Global.cpp b/src/Global.cpp
index 6300a286..8e7750f1 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -379,7 +379,8 @@ void lamexp_message_handler(QtMsgType type, const char *msg)
if(g_lamexp_console_attached)
{
- SetConsoleOutputCP(CP_UTF8);
+ UINT oldOutputCP = GetConsoleOutputCP();
+ if(oldOutputCP != CP_UTF8) SetConsoleOutputCP(CP_UTF8);
switch(type)
{
@@ -405,6 +406,7 @@ void lamexp_message_handler(QtMsgType type, const char *msg)
}
lamexp_console_color(stderr, FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED);
+ if(oldOutputCP != CP_UTF8) SetConsoleOutputCP(oldOutputCP);
}
else
{
@@ -474,6 +476,9 @@ void lamexp_init_console(int argc, char* argv[])
{
if(AllocConsole() != FALSE)
{
+ SetConsoleCtrlHandler(NULL, TRUE);
+ SetConsoleTitle(L"LameXP - Audio Encoder Front-End | Debug Console");
+ SetConsoleOutputCP(CP_UTF8);
g_lamexp_console_attached = true;
}
}
@@ -483,8 +488,9 @@ void lamexp_init_console(int argc, char* argv[])
//-------------------------------------------------------------------
//See: http://support.microsoft.com/default.aspx?scid=kb;en-us;105305
//-------------------------------------------------------------------
- int hCrtStdOut = _open_osfhandle((intptr_t) GetStdHandle(STD_OUTPUT_HANDLE), _O_BINARY);
- int hCrtStdErr = _open_osfhandle((intptr_t) GetStdHandle(STD_ERROR_HANDLE), _O_BINARY);
+ const int flags = _O_WRONLY | _O_U8TEXT;
+ int hCrtStdOut = _open_osfhandle((intptr_t) GetStdHandle(STD_OUTPUT_HANDLE), flags);
+ int hCrtStdErr = _open_osfhandle((intptr_t) GetStdHandle(STD_ERROR_HANDLE), flags);
FILE *hfStdOut = _fdopen(hCrtStdOut, "w");
FILE *hfStderr = _fdopen(hCrtStdErr, "w");
if(hfStdOut) *stdout = *hfStdOut;
@@ -501,10 +507,6 @@ void lamexp_init_console(int argc, char* argv[])
SetWindowLong(hwndConsole, GWL_STYLE, GetWindowLong(hwndConsole, GWL_STYLE) & (~WS_MAXIMIZEBOX));
SetWindowLong(hwndConsole, GWL_STYLE, GetWindowLong(hwndConsole, GWL_STYLE) & (~WS_MINIMIZEBOX));
-
- SetConsoleCtrlHandler(NULL, TRUE);
- SetConsoleTitle(L"LameXP - Audio Encoder Front-End | Debug Console");
- SetConsoleOutputCP(CP_UTF8);
}
}
}
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index f30257be..9f8bf4e1 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -82,7 +82,6 @@ LAMEXP_MAKE_ID(autoUpdateEnabled, "AutoUpdate/Enabled");
LAMEXP_MAKE_ID(autoUpdateCheckBeta, "AutoUpdate/CheckForBetaVersions");
LAMEXP_MAKE_ID(soundsEnabled, "Flags/EnableSounds");
LAMEXP_MAKE_ID(neroAacNotificationsEnabled, "Flags/EnableNeroAacNotifications");
-LAMEXP_MAKE_ID(wmaDecoderNotificationsEnabled, "Flags/EnableWmaDecoderNotifications");
LAMEXP_MAKE_ID(antivirNotificationsEnabled, "Flags/EnableAntivirusNotifications");
LAMEXP_MAKE_ID(dropBoxWidgetEnabled, "Flags/EnableDropBoxWidget");
LAMEXP_MAKE_ID(shellIntegrationEnabled, "Flags/EnableShellIntegration");
@@ -272,7 +271,6 @@ LAMEXP_MAKE_OPTION_B(autoUpdateEnabled, true)
LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta, false)
LAMEXP_MAKE_OPTION_B(soundsEnabled, true)
LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled, true)
-LAMEXP_MAKE_OPTION_B(wmaDecoderNotificationsEnabled, true)
LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled, true)
LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled, !lamexp_portable_mode())
diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index daea404b..04a5c5dd 100644
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -92,7 +92,6 @@ public:
LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta);
LAMEXP_MAKE_OPTION_B(soundsEnabled);
LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled);
- LAMEXP_MAKE_OPTION_B(wmaDecoderNotificationsEnabled);
LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled);
LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled);
LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled);