Removed some more remnants of "old" WMA decoder + updated changelog.

doc/Changelog.html

@@ -18,6 +18,7 @@ a:visited { color: #0000EE; }
 
 <a name="4.02"></a>Changes between v4.02 and v4.03:<br><ul>
 <li>Added "built-in" WMA decoder (see <a href="http://forum.doom9.org/showthread.php?t=140273">this</a> thread for details) and removed all remnants of "old" decoder
+<li>Updated Qt runtime libraries to v4.8.0 Beta-1 (2011-07-19), compiled with MSVC 10.0
 <li>Updated MediaInfo to v0.7.47 (2011-07-27), compiled with MSVC 10.0
 <li>Updated language files (big thank-you to all contributors !!!)
 <li>Fixed Cue Sheet import for tracks with certain characters in the title

etc/Translation/Blank.ts

@@ -1041,10 +1041,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation type="unfinished"></translation>

etc/Translation/LameXP_DE.ts

@@ -754,10 +754,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation>Nero AAC-Meldungen deaktivieren</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation>WMA-Dekodierer-Meldungen deaktivieren</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation>DropBox anzeigen</translation>

etc/Translation/LameXP_ES.ts

@@ -757,10 +757,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation>Deshabilitar notificaciones de Nero AAC</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation>Deshabilitar notificaciones del decodificador WMA</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation>Mostar DropBox</translation>

etc/Translation/LameXP_FR.ts

@@ -762,10 +762,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation>Désactiver les notifications Nero AAC</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation>Désactiver les notifications du décodeur WMA</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation>Afficher la DropBox</translation>

etc/Translation/LameXP_IT.ts

@@ -754,10 +754,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation>Disabilita le notifiche di Nero AAC</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation>Disabilita le notifiche del decoder WMA</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation>Mostra la DropBox</translation>

etc/Translation/LameXP_KR.ts

@@ -949,10 +949,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation type="unfinished">Nero AAC 알림 비활성화</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation type="unfinished">WMA 디코더 알림 비활성화</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation type="unfinished">드롭박스 표시</translation>

etc/Translation/LameXP_RU.ts

@@ -924,10 +924,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation type="unfinished">Отключить сообщения Nero AAC</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation type="unfinished">Отключить сообщения WMA Decoder</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation type="unfinished">Показать DropBox</translation>

etc/Translation/LameXP_UK.ts

@@ -902,10 +902,6 @@
         <source>Disable Nero AAC Notifications</source>
         <translation>Заборонити нагадування  про Nero AAC</translation>
     </message>
-    <message>
-        <source>Disable WMA Decoder Notifications</source>
-        <translation>Заборонити нагадування про декодер WMA</translation>
-    </message>
     <message>
         <source>Show DropBox</source>
         <translation>Відображати DropBox</translation>

gui/MainWindow.ui

@@ -3269,14 +3269,6 @@
     <string>Disable Nero AAC Notifications</string>
    </property>
   </action>
-  <action name="actionDisableWmaDecoderNotifications">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Disable WMA Decoder Notifications</string>
-   </property>
-  </action>
   <action name="actionShowDropBoxWidget">
    <property name="icon">
     <iconset resource="../res/Icons.qrc">

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_PATCH					6
-#define VER_LAMEXP_BUILD					611
+#define VER_LAMEXP_BUILD					612
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions

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());

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);
+			const int flags = _O_WRONLY | _O_U8TEXT;
-			int hCrtStdErr = _open_osfhandle((intptr_t) GetStdHandle(STD_ERROR_HANDLE), _O_BINARY);
+			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);
 		}
 	}
 }

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())

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);