Some more clean-up for FhgAacEnc support + updated documents.

diff --git a/doc/Changelog.html b/doc/Changelog.html
index f0a77f2..0dbf59a 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -20,6 +20,7 @@ a:visited { color: #0000EE; }
 <li>Added an option to rename the output files (based on an user-defined pattern)
 <li>Added an option to enforce Stereo Downmix for Multi-Channel sources
 <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>Added optional support for the FHG AAC Encoder (see the <a href="FAQ.html#71a113b0" target="_blank">FAQ doc</a> for install instructions!)
 <li>Added a menu for bookmarking "favorite" output folders to the "output folder" tab
 <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.48 (2011-08-17), compiled with MSVC 10.0

diff --git a/doc/FAQ.html b/doc/FAQ.html
index 1902f94..a89bbdf 100644 (file)
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -71,21 +71,20 @@ any ACM Codecs or DirectShow/DMO filters! And it will NOT install anything of th
 
 <a name="be0a8459"></a><b>What platforms does LameXP run on?</b><br>
 <br>
-LameXP is currently being developed and tested on the following platforms:<br><ul>
-<li>Microsoft Windows XP, Service Pack 3
-<li>Microsoft Windows 7, 32-Bit and 64-Bit editions</ul>
-<br>
-The following platforms should work as well, but aren't tested extensively:<br><ul>
-<li>Microsoft Windows XP, Service Pack 2
-<li>Microsoft Windows Vista, 32-Bit and 64-Bit editions
+LameXP is currently being developed on the following platforms:<br><ul>
+<li>Microsoft Windows 7 with Service Pack 1 (32-Bit and 64-Bit editions)
+<li>Microsoft Windows XP with Service Pack 3</ul>
+<br>
+The following platforms should work, but aren't tested extensively:<br><ul>
+<li>Microsoft Windows 7 without Service Pack (32-Bit and 64-Bit editions)
+<li>Microsoft Windows Vista (32-Bit and 64-Bit editions)
+<li>Microsoft Windows XP with Service Pack 2 or even older
+<li>Microsoft Windows 2000
 <li>Microsoft Windows Server 2008
 <li>Microsoft Windows Server 2008 R2
 <li>GNU/Linux using Wine (native Linux version planned)</ul>
 <br>
-The following platforms are NOT supported any longer:<br><ul>
-<li>Microsoft Windows XP, Service Pack 1
-<li>Microsoft Windows XP, RTM (i.e. without Service Pack)
-<li>Microsoft Windows 2000
+The following "legacy" platforms are NOT supported any longer:<br><ul>
 <li>Microsoft Windows NT 4.0
 <li>Microsoft Windows Millennium Edition
 <li>Microsoft Windows 98
@@ -287,7 +286,25 @@ After you have downloaded the Nero AAC Encoder as a ZIP file, you must "install"
 LameXP can use them. Simply unzip the files 'neroAacEnc.exe', 'neroAacDec.exe' as well as 'neroAacTag.exe' to<br>
 the same directory where your LameXP executable ('LameXP.exe') is located. For unzipping the ZIP file you can<br>
 use any suitable archiver, such as <a href="http://rarlabs.com/download.htm" target="_blank">WinRAR</a> or <a href="http://sevenzip.sourceforge.net/" target="_blank">7-Zip</a>. Once the required Nero encoder binaries are located in<br>
-the LameXP directory, the AAC encoding option should be "enabled" on the next startup of LameXP.<br><br>
+the LameXP directory, the AAC encoding option should be "enabled" on the next startup of LameXP.<br>
+<br>
+Optionally LameXP also supports the FHG AAC Encoder now. Just like the Nero encoder, the FHG encoder can NOT<br>
+be redistributed along with LameXP. However the FHG AAC Encoder is included with Winamp v5.62, which is<br>
+available as a free download (you don't need to buy the "Pro" version!) from the official Winamp web-site at:<br><ul>
+<li><a href="http://www.winamp.com/media-player/" target="_blank">http://www.winamp.com/media-player/</a>
+<li><a href="http://download.nullsoft.com/winamp/client/winamp5621_full_emusic-7plus_de-de.exe" target="_blank">http://download.nullsoft.com/winamp/client/winamp5621_full_emusic-7plus_de-de.exe</a></ul>
+<br>
+In order to enable the FHG AAC Encoder support you will also need the 'FHG AAC Encoder Add-in' for LameXP:<br><ul>
+<li><a href="http://www.megaupload.com/?d=GLBGP0K8" target="_blank">http://www.megaupload.com/?d=GLBGP0K8</a>
+<li><a href="http://www.zshare.net/download/9394232900ea4ef9/" target="_blank">http://www.zshare.net/download/9394232900ea4ef9/</a>
+<li><a href="http://www.mediafire.com/?sk583zvc544j2nk" target="_blank">http://www.mediafire.com/?sk583zvc544j2nk</a>
+<li><a href="http://www.gamefront.com/files/20700206/LameXP.fhgaacenc-addin.2011-08-21.rar" target="_blank">http://www.gamefront.com/files/20700206/LameXP.fhgaacenc-addin.2011-08-21.rar</a>
+<li><a href="http://www.easy-share.com/1917621524/LameXP.fhgaacenc-addin.2011-08-21.rar" target="_blank">http://www.easy-share.com/1917621524/LameXP.fhgaacenc-addin.2011-08-21.rar</a>
+<li><a href="http://www.rapidshare.com/files/2188219435/LameXP.fhgaacenc-addin.2011-08-21.rar" target="_blank">http://www.rapidshare.com/files/2188219435/LameXP.fhgaacenc-addin.2011-08-21.rar</a>
+<li><a href="http://uploaded.to/file/bftd4stj" target="_blank">http://uploaded.to/file/bftd4stj</a></ul>
+<br>
+Please follow the install instructions that are included with the 'FHG AAC Encoder Add-in' download package!<br>
+Note that you do NOT need to install the Add-in, if you only want to use the Nero AAC Encoder.<br><br>
 
 <br><br>
 
@@ -535,19 +552,15 @@ switching to the 'Compatibility' tab and un-checking the 'Run this program in co
 
 <br><br>
 
-<a name="328b0a18"></a><b>Why do I get the error 'Executable requires Windows XP or later' on startup?</b><br>
-<a name="3ffe490e"></a><b>Why do I get the error 'The procedure entry point De/EncodePointer could not be located' on startup?</b><br>
+<a name="328b0a18"></a><b>Why do I get the error 'Executable requires Windows 2000 or later' on startup?</b><br>
+<a name="3ffe490e"></a><b>Why do I get the error 'The procedure entry point &lt;Something&gt; could not be located' on startup?</b><br>
 <a name="01922741"></a><b>Why do I get the error 'LameXP.exe is not a valid Win32 application' on startup?</b><br>
 <br>
 You are trying to run LameXP on a platform that is NOT supported, such as Windows 95, Windows 98, Windows<br>
-Millennium Edition, Windows NT 4.0 or Windows 2000. There is nothing you can do about that, except for<br>
-updating to a less antiquated OS. Running an outdated and unsupported OS is a severe security risk anyway!<br>
-<br>
-LameXP won't run on the 'RTM' release of Windows XP (no service packs) either. Service Pack 2 or newer is<br>
-required! If needed, you can download Service Pack 3 for Windows XP as <a href="http://www.microsoft.com/downloads/en/details.aspx?FamilyID=5b33b5a8-5e76-401f-be08-1e1555d4f3d4" target="_blank">network installation</a> or as <a href="http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2FCDE6CE-B5FB-4488-8C50-FE22559D164E" target="_blank">ISO image</a>.<br>
-Finally this error can also occur, if your system has been configured to run LameXP in <a href="#e7c9ae2b">compatibility mode</a>.<br>
+Millennium Edition, Windows NT 4.0. There is nothing you can do about that, except for updating to a less<br>
+antiquated OS. Running an outdated and unsupported OS is a severe security risk anyway!<br>
 <br>
-Remark: Executables compiled with Microsoft Visual Studio 2010 won't run on Windows 2000 or older (<a href="http://msdn.microsoft.com/en-us/library/ws0swas0(v=VS.100).aspx" target="_blank">details</a>).<br><br>
+Note: This error can also occur, if your system has been configured to run LameXP in <a href="#e7c9ae2b">compatibility mode</a>.<br><br>
 
 <br><br>
 
@@ -557,10 +570,8 @@ This error message from the Windows operating system is somewhat misleading. It
 a second error message and it means that Windows was unable to load/execute the program file. There are<br>
 various reasons why this error might occur, but usually it indicates that you are trying to run LameXP or the<br>
 LameXP setup/update program on a platform that is NOT supported, such as Windows 95, Windows 98, Windows<br>
-Millennium Edition, Windows NT 4.0 or Windows 2000. There is nothing you can do about that, except for<br>
-updating to a less antiquated OS. Running an outdated and unsupported OS is a severe security risk anyway!<br>
-<br>
-Remark: Executables compiled with Microsoft Visual Studio 2010 won't run on Windows 2000 or older (<a href="http://msdn.microsoft.com/en-us/library/ws0swas0(v=VS.100).aspx" target="_blank">details</a>).<br><br>
+Millennium Edition, Windows NT 4.0. There is nothing you can do about that, except for updating to a less<br>
+antiquated OS. Running an outdated and unsupported OS is a severe security risk anyway!<br><br>
 
 <br><br>
 
@@ -602,6 +613,7 @@ The preferred place to report bugs or request new features is the LameXP thread
 <li><a href="http://forum.gleitz.info/showthread.php?t=37956" target="_blank">http://forum.gleitz.info/showthread.php?t=37956</a> (German)</ul>
 <br>
 Please do NOT send me E-Mail unless you really have to! I receive a LOT of E-Mail and your mail can get lost!<br><br>
+
 <br><br>
 
 <a name="e5694e3e"></a><b>What programming language is LameXP written in?</b><br>

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index cd7070d..f842578 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -704,7 +704,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="242"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="684"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="685"/>
         <source>Show Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -985,7 +985,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="1619"/>
-        <source>Nero AAC Options</source>
+        <source>AAC Encoder-Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1074,7 +1074,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="2177"/>
-        <source>Nero AAC:</source>
+        <source>MPEG-4 AAC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1331,9 +1331,9 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3458"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="918"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="944"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="963"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="919"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="945"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="964"/>
         <source>Check for Updates</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1374,13 +1374,13 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3527"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1367"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1368"/>
         <source>Disable Update Reminder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3535"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1393"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1394"/>
         <source>Disable Sound Effects</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1455,671 +1455,671 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="483"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="484"/>
         <source>Adding file(s), please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="487"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2855"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="488"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2856"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="487"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="488"/>
         <source>%1 file(s) have been rejected, because read access was not granted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="487"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="488"/>
         <source>This usually means the file is locked by another process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="491"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="492"/>
         <source>CDDA Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="491"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="492"/>
         <source>%1 file(s) have been rejected, because they are dummy CDDA files!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="491"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="492"/>
         <source>Sorry, LameXP cannot extract audio tracks from an Audio&amp;minus;CD at present.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="491"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="492"/>
         <source>We recommend using %1 for that purpose.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="495"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="496"/>
         <source>Cue Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="495"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="496"/>
         <source>%1 file(s) have been rejected, because they appear to be Cue Sheet images!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="495"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="496"/>
         <source>Please use LameXP&apos;s Cue Sheet wizard for importing Cue Sheet files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="499"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="500"/>
         <source>Files Rejected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="499"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="500"/>
         <source>%1 file(s) have been rejected, because the file format could not be recognized!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="499"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="500"/>
         <source>This usually means the file is damaged or the file format is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="516"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="517"/>
         <source>Scanning folder(s) for files, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="679"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="680"/>
         <source>DEMO VERSION</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="683"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="684"/>
         <source>You can drop in audio files here!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="685"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="686"/>
         <source>Open File in External Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="686"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="687"/>
         <source>Browse File Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="687"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="688"/>
         <source>Browse Selected Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="688"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="689"/>
         <source>Bookmark Current Output Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="898"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="899"/>
         <source>License Declined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="898"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="899"/>
         <source>You have declined the license. Consequently the application will exit now!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="898"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="899"/>
         <source>Goodbye!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="918"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="919"/>
         <source>LameXP - Expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="918"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="919"/>
         <source>This demo (pre-release) version of LameXP has expired at %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="918"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="919"/>
         <source>LameXP is free software and release versions won&apos;t expire.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="918"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="944"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="919"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="945"/>
         <source>Exit Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="931"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="932"/>
         <source>It seems that a bogus anti-virus software is slowing down the startup of LameXP.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="932"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="933"/>
         <source>Please refer to the %1 document for details and solutions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="933"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="934"/>
         <source>Slow Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="933"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1003"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1550"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2813"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="934"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1004"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1551"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2814"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="933"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1003"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="934"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1004"/>
         <source>Don&apos;t Show Again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="944"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="945"/>
         <source>Urgent Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="944"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="945"/>
         <source>Your version of LameXP is more than a year old. Time for an update!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="963"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1369"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1379"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="964"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1370"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1380"/>
         <source>Update Reminder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="963"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="964"/>
         <source>Your last update check was more than 14 days ago. Check for updates now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="963"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="964"/>
         <source>Your did not check for LameXP updates yet. Check for updates now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="963"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="964"/>
         <source>Postpone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="982"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="983"/>
         <source>LameXP detected that your version of the Nero AAC encoder is outdated!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="983"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="984"/>
         <source>The current version available is %1 (or later), but you still have version %2 installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="983"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="984"/>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="984"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="985"/>
         <source>You can download the latest version of the Nero AAC encoder from the Nero website at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="986"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="987"/>
         <source>AAC Encoder Outdated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="997"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="998"/>
         <source>The Nero AAC encoder could not be found. AAC encoding support will be disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="998"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="999"/>
         <source>Please put &apos;neroAacEnc.exe&apos;, &apos;neroAacDec.exe&apos; and &apos;neroAacTag.exe&apos; into the LameXP directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="999"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1000"/>
         <source>Your LameXP directory is located here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1001"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1002"/>
         <source>You can download the Nero AAC encoder for free from the official Nero website at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1003"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1004"/>
         <source>AAC Support Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1074"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1118"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1128"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1075"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1119"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1129"/>
         <source>LameXP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1074"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1075"/>
         <source>You must add at least one file to the list before proceeding!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1082"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1083"/>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1082"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1083"/>
         <source>Your currently selected TEMP folder does not exist anymore:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1082"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1083"/>
         <source>Restore Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1082"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1083"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>Low Diskspace Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>There are less than %1 GB of free diskspace available on your system&apos;s TEMP folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>It is highly recommend to free up more diskspace before proceeding with the encode!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>Your TEMP folder is located at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>Abort Encoding Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>Clean Disk Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1095"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1096"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1103"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1104"/>
         <source>Low Diskspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1103"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1104"/>
         <source>You are proceeding with low diskspace. Problems might occur!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1118"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1119"/>
         <source>Sorry, an unsupported encoder has been chosen!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1128"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1129"/>
         <source>Cannot write to the selected output directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1128"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1129"/>
         <source>Please choose a different directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1334"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1335"/>
         <source>Load Translation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1336"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1337"/>
         <source>Translation Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1367"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1368"/>
         <source>Do you really want to disable the update reminder?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1367"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1393"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1419"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1471"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1548"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1585"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1368"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1394"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1420"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1472"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1549"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1586"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1367"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1393"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1419"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1471"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1548"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1585"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1368"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1394"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1420"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1472"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1549"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1586"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1369"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1370"/>
         <source>The update reminder has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1369"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1370"/>
         <source>Please remember to check for updates at regular intervals!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1379"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1380"/>
         <source>The update reminder has been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1393"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1394"/>
         <source>Do you really want to disable all sound effects?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1395"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1405"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1396"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1406"/>
         <source>Sound Effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1395"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1396"/>
         <source>All sound effects have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1405"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1406"/>
         <source>The sound effects have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1419"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1421"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1431"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1420"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1422"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1432"/>
         <source>Nero AAC Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1419"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1420"/>
         <source>Do you really want to disable all Nero AAC Encoder notifications?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1421"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1422"/>
         <source>All Nero AAC Encoder notifications have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1431"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1432"/>
         <source>The Nero AAC Encoder notifications have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1471"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1473"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1483"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1472"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1474"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1484"/>
         <source>Slow Startup Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1471"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1472"/>
         <source>Do you really want to disable the slow startup notifications?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1473"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1474"/>
         <source>The slow startup notifications have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1483"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1484"/>
         <source>The slow startup notifications have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1514"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1515"/>
         <source>Open Cue Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1514"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1515"/>
         <source>Cue Sheet File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1548"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1550"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1563"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1549"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1551"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1564"/>
         <source>Beta Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1548"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1549"/>
         <source>Do you really want LameXP to check for Beta (pre-release) updates?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1550"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1551"/>
         <source>LameXP will check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1550"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1551"/>
         <source>Check Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1563"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1564"/>
         <source>LameXP will &lt;i&gt;not&lt;/i&gt; check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1585"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1588"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1599"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1586"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1589"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1600"/>
         <source>Shell Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1585"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1586"/>
         <source>Do you really want to disable the LameXP shell integration?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1588"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1589"/>
         <source>The LameXP shell integration has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1599"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1600"/>
         <source>The LameXP shell integration has been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1696"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1704"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1697"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1705"/>
         <source>Add file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1731"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1735"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1732"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1736"/>
         <source>Add Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2099"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2142"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2100"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2143"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2142"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2143"/>
         <source>Enter the name of the new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2174"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2175"/>
         <source>Failed to create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2174"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2175"/>
         <source>The new folder could not be created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2174"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2175"/>
         <source>Drive is read-only or insufficient access rights!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2454"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2457"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2460"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2466"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2455"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2458"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2461"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2467"/>
         <source>Quality Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2463"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2483"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2503"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2464"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2484"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2504"/>
         <source>Compression %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2469"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2489"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2509"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2470"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2490"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2510"/>
         <source>Uncompressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2533"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2534"/>
         <source>Best Quality (Very Slow)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2536"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2537"/>
         <source>High Quality (Recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2539"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2540"/>
         <source>Average Quality (Default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2542"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2543"/>
         <source>Low Quality (Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2545"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2546"/>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2802"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2803"/>
         <source>File name without extension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2803"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2804"/>
         <source>Track number with leading zero</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2804"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2805"/>
         <source>Track title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2805"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2806"/>
         <source>Artist name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2806"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2807"/>
         <source>Album name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2807"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2808"/>
         <source>Year with (at least) four digits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2808"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2809"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2810"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2811"/>
         <source>Characters forbidden in file names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2813"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2814"/>
         <source>Rename Macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2826"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2827"/>
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2855"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2856"/>
         <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2922"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2923"/>
         <source>Already Running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2922"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2923"/>
         <source>LameXP is already running, please use the running instance!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2632,23 +2632,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="772"/>
+        <location filename="../../src/Dialog_Processing.cpp" line="773"/>
         <source>Playlist creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="772"/>
+        <location filename="../../src/Dialog_Processing.cpp" line="773"/>
         <source>The playlist file could not be created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="812"/>
+        <location filename="../../src/Dialog_Processing.cpp" line="813"/>
         <source>Warning: Computer will shutdown in %1 seconds...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_Processing.cpp" line="816"/>
         <location filename="../../src/Dialog_Processing.cpp" line="817"/>
+        <location filename="../../src/Dialog_Processing.cpp" line="818"/>
         <source>Cancel Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2669,17 +2669,17 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="668"/>
+        <location filename="../../src/Global.cpp" line="670"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="755"/>
+        <location filename="../../src/Global.cpp" line="757"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="783"/>
+        <location filename="../../src/Global.cpp" line="785"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index cfb0b50..d1fd5dc 100644 (file)
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1195,10 +1195,6 @@
         <translation>Abtastrate (Hz):</translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation>Nero AAC-Optionen</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation>2 Durchläufe verwenden (ABR Modus)</translation>
     </message>
@@ -1283,10 +1279,6 @@
         <translation></translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation></translation>
     </message>
@@ -1642,6 +1634,14 @@
         <source>MPEG-4 AAC</source>
         <translation></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation>AAC-Kodierer Optionen</translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index de19a94..316d90a 100644 (file)
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1194,10 +1194,6 @@
         <translation>Frecuencia de muestreo (Hz):</translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation>Opciones de Nero AAC</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation>Procesamiento en 2-Pasos (Modo ABR)</translation>
     </message>
@@ -1282,10 +1278,6 @@
         <translation>QggEnc2:</translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation>Nero AAC:</translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation>FLAC:</translation>
     </message>
@@ -1641,6 +1633,14 @@
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 17cd8b7..7cb634c 100644 (file)
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1203,10 +1203,6 @@ Sélection automatique (par défaut)</translation>
         <translation>Taux d&apos;échantillonnage (Hz) :</translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation>Option Nero AAC</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation>Permettre le traitement en 2-Pass (Mode ABR)</translation>
     </message>
@@ -1291,10 +1287,6 @@ Sélection automatique (par défaut)</translation>
         <translation>OggEnc2 :</translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation>Nero AAC :</translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation>FLAC :</translation>
     </message>
@@ -1651,6 +1643,14 @@ Ouvrir le dossier récursivement...</translation>
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 590e04e..b09950c 100644 (file)
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1195,10 +1195,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1283,10 +1279,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1642,6 +1634,14 @@
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index 7f998e8..5989c18 100644 (file)
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -758,10 +758,6 @@
         <translation type="unfinished">48.000</translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation type="unfinished">Nero AAC 옵션</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation type="unfinished">2-패스 처리 (ABR 모드) 활성화</translation>
     </message>
@@ -818,10 +814,6 @@
         <translation type="unfinished">OggEnc2:</translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation type="unfinished">Nero AAC:</translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation type="unfinished">FLAC:</translation>
     </message>
@@ -1641,6 +1633,14 @@
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index b007118..ef0dcff 100644 (file)
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -761,10 +761,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation type="unfinished">Опции Nero AAC</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation type="unfinished">Включить 2-х проходное преобразование (ABR Mode)</translation>
     </message>
@@ -821,10 +817,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1647,6 +1639,14 @@
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 92f2a83..708514b 100644 (file)
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -759,10 +759,6 @@
         <translation>48.000</translation>
     </message>
     <message>
-        <source>Nero AAC Options</source>
-        <translation>Опції Nero AAC</translation>
-    </message>
-    <message>
         <source>Enable 2-Pass Processing (ABR Mode)</source>
         <translation>Задіяти обробку у 2 етапи (ABR Mode)</translation>
     </message>
@@ -1283,10 +1279,6 @@
         <translation>OggEnc2:</translation>
     </message>
     <message>
-        <source>Nero AAC:</source>
-        <translation>Nero AAC:</translation>
-    </message>
-    <message>
         <source>FLAC:</source>
         <translation>FLAC:</translation>
     </message>
@@ -1642,6 +1634,14 @@
         <source>MPEG-4 AAC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AAC Encoder-Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MPEG-4 AAC:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 27763ef..1832fb2 100644 (file)
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1099,8 +1099,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>602</width>
-               <height>1423</height>
+               <width>604</width>
+               <height>1426</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_22">
@@ -1616,7 +1616,7 @@
                    </font>
                   </property>
                   <property name="title">
-                   <string>Nero AAC Options</string>
+                   <string>AAC Encoder-Options</string>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_25">
                    <item row="3" column="1">
@@ -1668,7 +1668,7 @@
                       </widget>
                      </item>
                      <item row="1" column="4">
-                      <widget class="QComboBox" name="comboBoxNeroAACProfile">
+                      <widget class="QComboBox" name="comboBoxAACProfile">
                        <property name="sizeAdjustPolicy">
                         <enum>QComboBox::AdjustToContents</enum>
                        </property>
@@ -2174,7 +2174,7 @@
                      <item row="3" column="1">
                       <widget class="QLabel" name="label_11">
                        <property name="text">
-                        <string>Nero AAC:</string>
+                        <string>MPEG-4 AAC:</string>
                        </property>
                       </widget>
                      </item>

diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index ba0e76d..d61d9b5 100644 (file)
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 0ba4f40..de20f93 100644 (file)
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 a3dec49..0148a20 100644 (file)
Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ

diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm
index 9c56a6f..0fd3731 100644 (file)
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 93d0437..d759507 100644 (file)
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 55c2d55..3420b17 100644 (file)
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 6228c10..8c847c0 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,14 +29,15 @@
 #define VER_LAMEXP_MINOR_HI                                    0
 #define VER_LAMEXP_MINOR_LO                                    3
 #define VER_LAMEXP_TYPE                                                Alpha
-#define VER_LAMEXP_PATCH                                       13
-#define VER_LAMEXP_BUILD                                       654
+#define VER_LAMEXP_PATCH                                       14
+#define VER_LAMEXP_BUILD                                       656
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions
 ///////////////////////////////////////////////////////////////////////////////
 
 #define VER_LAMEXP_TOOL_NEROAAC                                1540
+#define VER_LAMEXP_TOOL_FHGAACENC                      20110821
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper macros (aka: having fun with the C pre-processor)

diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index e042565..32f8917 100644 (file)
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -228,7 +228,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSize());
        comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelMode());
        comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRate());
-       comboBoxNeroAACProfile->setCurrentIndex(m_settings->neroAACProfile());
+       comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfile());
        comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingMode());
        comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompression());
        while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabled()) checkBoxBitrateManagement->click();
@@ -239,9 +239,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        while(checkBoxUseSystemTempFolder->isChecked() == m_settings->customTempPathEnabled()) checkBoxUseSystemTempFolder->click();
        while(checkBoxRenameOutput->isChecked() != m_settings->renameOutputFilesEnabled()) checkBoxRenameOutput->click();
        while(checkBoxForceStereoDownmix->isChecked() != m_settings->forceStereoDownmix()) checkBoxForceStereoDownmix->click();
+       checkBoxNeroAAC2PassMode->setEnabled(!m_fhgEncoderAvailable);
        lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
        lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEnc());
-       lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAAC());
+       lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEnc());
        lineEditCustomParamFLAC->setText(m_settings->customParametersFLAC());
        lineEditCustomParamAften->setText(m_settings->customParametersAften());
        lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPath()));
@@ -253,7 +254,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        connect(comboBoxMP3ChannelMode, SIGNAL(currentIndexChanged(int)), this, SLOT(channelModeChanged(int)));
        connect(comboBoxSamplingRate, SIGNAL(currentIndexChanged(int)), this, SLOT(samplingRateChanged(int)));
        connect(checkBoxNeroAAC2PassMode, SIGNAL(clicked(bool)), this, SLOT(neroAAC2PassChanged(bool)));
-       connect(comboBoxNeroAACProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(neroAACProfileChanged(int)));
+       connect(comboBoxAACProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(neroAACProfileChanged(int)));
        connect(checkBoxNormalizationFilter, SIGNAL(clicked(bool)), this, SLOT(normalizationEnabledChanged(bool)));
        connect(comboBoxAftenCodingMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenCodingModeChanged(int)));
        connect(comboBoxAftenDRCMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenDRCModeChanged(int)));
@@ -655,7 +656,7 @@ void MainWindow::changeEvent(QEvent *e)
                //Backup combobox indices, as retranslateUi() resets
                comboBoxIndex[0] = comboBoxMP3ChannelMode->currentIndex();
                comboBoxIndex[1] = comboBoxSamplingRate->currentIndex();
-               comboBoxIndex[2] = comboBoxNeroAACProfile->currentIndex();
+               comboBoxIndex[2] = comboBoxAACProfile->currentIndex();
                comboBoxIndex[3] = comboBoxAftenCodingMode->currentIndex();
                comboBoxIndex[4] = comboBoxAftenDRCMode->currentIndex();
                
@@ -665,7 +666,7 @@ void MainWindow::changeEvent(QEvent *e)
                //Restore combobox indices
                comboBoxMP3ChannelMode->setCurrentIndex(comboBoxIndex[0]);
                comboBoxSamplingRate->setCurrentIndex(comboBoxIndex[1]);
-               comboBoxNeroAACProfile->setCurrentIndex(comboBoxIndex[2]);
+               comboBoxAACProfile->setCurrentIndex(comboBoxIndex[2]);
                comboBoxAftenCodingMode->setCurrentIndex(comboBoxIndex[3]);
                comboBoxAftenDRCMode->setCurrentIndex(comboBoxIndex[4]);
 
@@ -2622,7 +2623,7 @@ void MainWindow::neroAAC2PassChanged(bool checked)
  */
 void MainWindow::neroAACProfileChanged(int value)
 {
-       if(value >= 0) m_settings->neroAACProfile(value);
+       if(value >= 0) m_settings->aacEncProfile(value);
 }
 
 /*
@@ -2726,7 +2727,7 @@ void MainWindow::customParamsChanged(void)
 
        m_settings->customParametersLAME(lineEditCustomParamLAME->text());
        m_settings->customParametersOggEnc(lineEditCustomParamOggEnc->text());
-       m_settings->customParametersNeroAAC(lineEditCustomParamNeroAAC->text());
+       m_settings->customParametersAacEnc(lineEditCustomParamNeroAAC->text());
        m_settings->customParametersFLAC(lineEditCustomParamFLAC->text());
        m_settings->customParametersAften(lineEditCustomParamAften->text());
 }
@@ -2887,7 +2888,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
        spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSizeDefault());
        comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelModeDefault());
        comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRateDefault());
-       comboBoxNeroAACProfile->setCurrentIndex(m_settings->neroAACProfileDefault());
+       comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfileDefault());
        comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault());
        comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault());
        while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabledDefault()) checkBoxBitrateManagement->click();
@@ -2900,7 +2901,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
        while(checkBoxForceStereoDownmix->isChecked() != m_settings->forceStereoDownmixDefault()) checkBoxForceStereoDownmix->click();
        lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault());
        lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault());
-       lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAACDefault());
+       lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEncDefault());
        lineEditCustomParamFLAC->setText(m_settings->customParametersFLACDefault());
        lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPathDefault()));
        lineEditRenamePattern->setText(m_settings->renameOutputFilesPatternDefault());

diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index 8cbf58d..775bef0 100644 (file)
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -596,22 +596,23 @@ void ProcessingDialog::startNextJob(void)
                break;
        case SettingsModel::AACEncoder:
                {
-                       if(lamexp_lookup_tool("fhgaacenc.exe").isEmpty() || lamexp_lookup_tool("enc_fhgaac.dll").isEmpty())
+                       if(lamexp_check_tool("fhgaacenc.exe") && lamexp_check_tool("enc_fhgaac.dll"))
                        {
-                               AACEncoder *aacEncoder = new AACEncoder();
+                               FHGAACEncoder *aacEncoder = new FHGAACEncoder();
                                aacEncoder->setBitrate(m_settings->compressionBitrate());
                                aacEncoder->setRCMode(m_settings->compressionRCMode());
-                               aacEncoder->setEnable2Pass(m_settings->neroAACEnable2Pass());
-                               aacEncoder->setProfile(m_settings->neroAACProfile());
-                               aacEncoder->setCustomParams(m_settings->customParametersNeroAAC());
+                               aacEncoder->setProfile(m_settings->aacEncProfile());
+                               aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
                                encoder = aacEncoder;
                        }
                        else
                        {
-                               FHGAACEncoder *aacEncoder = new FHGAACEncoder();
+                               AACEncoder *aacEncoder = new AACEncoder();
                                aacEncoder->setBitrate(m_settings->compressionBitrate());
                                aacEncoder->setRCMode(m_settings->compressionRCMode());
-                               aacEncoder->setProfile(m_settings->neroAACProfile());
+                               aacEncoder->setEnable2Pass(m_settings->neroAACEnable2Pass());
+                               aacEncoder->setProfile(m_settings->aacEncProfile());
+                               aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
                                encoder = aacEncoder;
                        }
                }

diff --git a/src/Encoder_AAC_FHG.cpp b/src/Encoder_AAC_FHG.cpp
index 11415ae..395eff8 100644 (file)
--- a/src/Encoder_AAC_FHG.cpp
+++ b/src/Encoder_AAC_FHG.cpp
@@ -89,6 +89,8 @@ bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel &meta
 
        args << "--dll" << m_binary_dll;
 
+       if(!m_configCustomParams.isEmpty()) args << m_configCustomParams.split(" ", QString::SkipEmptyParts);
+
        args << QDir::toNativeSeparators(sourceFile);
        args << QDir::toNativeSeparators(outputFile);
 

diff --git a/src/Global.cpp b/src/Global.cpp
index 522c3e8..0d8a4f4 100644 (file)
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -164,8 +164,9 @@ static bool g_lamexp_console_attached = false;
 static const char *g_lamexp_website_url = "http://lamexp.sourceforge.net/";
 static const char *g_lamexp_support_url = "http://forum.doom9.org/showthread.php?t=157726";
 
-//Tool versions (expected)
+//Tool versions (expected versions!)
 static const unsigned int g_lamexp_toolver_neroaac = VER_LAMEXP_TOOL_NEROAAC;
+static const unsigned int g_lamexp_toolver_fhgaacenc = VER_LAMEXP_TOOL_FHGAACENC;
 
 //Special folders
 static QString g_lamexp_temp_folder;
@@ -235,6 +236,7 @@ const char *lamexp_version_time(void) { return g_lamexp_version_raw_time; }
 const char *lamexp_version_compiler(void) { return g_lamexp_version_compiler; }
 const char *lamexp_version_arch(void) { return g_lamexp_version_arch; }
 unsigned int lamexp_toolver_neroaac(void) { return g_lamexp_toolver_neroaac; }
+unsigned int lamexp_toolver_fhgaacenc(void) { return g_lamexp_toolver_fhgaacenc; }
 
 /*
  * URL getters

diff --git a/src/Global.h b/src/Global.h
index f6bc00c..5137a4b 100644 (file)
--- a/src/Global.h
+++ b/src/Global.h
@@ -80,6 +80,7 @@ const char *lamexp_version_compiler(void);
 const char *lamexp_version_arch(void);
 QDate lamexp_version_expires(void);
 unsigned int lamexp_toolver_neroaac(void);
+unsigned int lamexp_toolver_fhgaacenc(void);
 const char *lamexp_website_url(void);
 const char *lamexp_support_url(void);
 

diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index 2864b6d..32edd08 100644 (file)
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -98,15 +98,15 @@ LAMEXP_MAKE_ID(aftenDynamicRangeCompression, "AdvancedOptions/Aften/DynamicRange
 LAMEXP_MAKE_ID(aftenFastBitAllocation, "AdvancedOptions/Aften/FastBitAllocation");
 LAMEXP_MAKE_ID(aftenExponentSearchSize, "AdvancedOptions/Aften/ExponentSearchSize");
 LAMEXP_MAKE_ID(samplingRate, "AdvancedOptions/Common/Resampling");
-LAMEXP_MAKE_ID(neroAACEnable2Pass, "AdvancedOptions/NeroAAC/Enable2Pass");
-LAMEXP_MAKE_ID(neroAACProfile, "AdvancedOptions/NeroAAC/ForceProfile");
+LAMEXP_MAKE_ID(neroAACEnable2Pass, "AdvancedOptions/AACEnc/Enable2Pass");
+LAMEXP_MAKE_ID(aacEncProfile, "AdvancedOptions/AACEnc/ForceProfile");
 LAMEXP_MAKE_ID(normalizationFilterEnabled, "AdvancedOptions/VolumeNormalization/Enabled");
 LAMEXP_MAKE_ID(normalizationFilterMaxVolume, "AdvancedOptions/VolumeNormalization/MaxVolume");
 LAMEXP_MAKE_ID(toneAdjustBass, "AdvancedOptions/ToneAdjustment/Bass");
 LAMEXP_MAKE_ID(toneAdjustTreble, "AdvancedOptions/ToneAdjustment/Treble");
 LAMEXP_MAKE_ID(customParametersLAME, "AdvancedOptions/CustomParameters/LAME");
 LAMEXP_MAKE_ID(customParametersOggEnc, "AdvancedOptions/CustomParameters/OggEnc");
-LAMEXP_MAKE_ID(customParametersNeroAAC, "AdvancedOptions/CustomParameters/NeroAAC");
+LAMEXP_MAKE_ID(customParametersAacEnc, "AdvancedOptions/CustomParameters/AacEnc");
 LAMEXP_MAKE_ID(customParametersAften, "AdvancedOptions/CustomParameters/Aften");
 LAMEXP_MAKE_ID(customParametersFLAC, "AdvancedOptions/CustomParameters/FLAC");
 LAMEXP_MAKE_ID(renameOutputFilesEnabled, "AdvancedOptions/RenameOutputFiles/Enabled");
@@ -291,7 +291,7 @@ LAMEXP_MAKE_OPTION_I(bitrateManagementMinRate, 32)
 LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate, 500)
 LAMEXP_MAKE_OPTION_I(samplingRate, 0)
 LAMEXP_MAKE_OPTION_B(neroAACEnable2Pass, true)
-LAMEXP_MAKE_OPTION_I(neroAACProfile, 0)
+LAMEXP_MAKE_OPTION_I(aacEncProfile, 0)
 LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode, 0);
 LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression, 5);
 LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation, false);
@@ -302,7 +302,7 @@ LAMEXP_MAKE_OPTION_I(toneAdjustBass, 0)
 LAMEXP_MAKE_OPTION_I(toneAdjustTreble, 0)
 LAMEXP_MAKE_OPTION_S(customParametersLAME, QString());
 LAMEXP_MAKE_OPTION_S(customParametersOggEnc, QString());
-LAMEXP_MAKE_OPTION_S(customParametersNeroAAC, QString());
+LAMEXP_MAKE_OPTION_S(customParametersAacEnc, QString());
 LAMEXP_MAKE_OPTION_S(customParametersAften, QString());
 LAMEXP_MAKE_OPTION_S(customParametersFLAC, QString());
 LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled, false);

diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index f3cbf96..5a62472 100644 (file)
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -105,7 +105,7 @@ public:
        LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate);
        LAMEXP_MAKE_OPTION_I(samplingRate);
        LAMEXP_MAKE_OPTION_B(neroAACEnable2Pass);
-       LAMEXP_MAKE_OPTION_I(neroAACProfile);
+       LAMEXP_MAKE_OPTION_I(aacEncProfile);
        LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode);
        LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression);
        LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation);
@@ -116,7 +116,7 @@ public:
        LAMEXP_MAKE_OPTION_I(toneAdjustTreble);
        LAMEXP_MAKE_OPTION_S(customParametersLAME);
        LAMEXP_MAKE_OPTION_S(customParametersOggEnc);
-       LAMEXP_MAKE_OPTION_S(customParametersNeroAAC);
+       LAMEXP_MAKE_OPTION_S(customParametersAacEnc);
        LAMEXP_MAKE_OPTION_S(customParametersAften);
        LAMEXP_MAKE_OPTION_S(customParametersFLAC);
        LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled);

diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index df337e3..fa15251 100644 (file)
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -433,8 +433,8 @@ void InitializationThread::initFhgAac(void)
                return;
        }
 
-       qDebug("Found FhgAacEnc executable:\n%s\n", fhgFileInfo[0].canonicalFilePath().toUtf8().constData());
-       qDebug("Found FhgAacEnc enclibrary:\n%s\n", fhgFileInfo[1].canonicalFilePath().toUtf8().constData());
+       qDebug("Found FhgAacEnc cli_exe:\n%s\n", fhgFileInfo[0].canonicalFilePath().toUtf8().constData());
+       qDebug("Found FhgAacEnc enc_dll:\n%s\n", fhgFileInfo[1].canonicalFilePath().toUtf8().constData());
 
        LockedFile *fhgBin[4];
        for(int i = 0; i < 4; i++) fhgBin[i] = NULL;
@@ -500,7 +500,7 @@ void InitializationThread::initFhgAac(void)
                for(int i = 0; i < 4; i++) LAMEXP_DELETE(fhgBin[i]);
                return;
        }
-       else if(fhgVersion < 20110819)
+       else if(fhgVersion < lamexp_toolver_fhgaacenc())
        {
                qWarning("FhgAacEnc version is too much outdated -> FhgAacEnc support will be disabled!");
                for(int i = 0; i < 4; i++) LAMEXP_DELETE(fhgBin[i]);