Make QAAC use "--cvbr" instead of "--abr" when ABR mode has been selected.

diff --git a/doc/Changelog.html b/doc/Changelog.html
index 48c5422..46234c3 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -104,6 +104,8 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');
 <li>Updated GnuPG to v1.4.19 (2015-02-27), compiled with GCC 4.9.2<br /></li>
 <li>Fixed potential deadlock in Cue Sheet import dialog when &quot;Browse...&quot; button is clicked<br /></li>
 <li>Fixed function to restore the default Temp folder, if custom Temp folder doesn't exist anymore<br /></li>
+<li>Fixed parsing of command-line parameters, regression in MUtilities library (LameXP v4.12 RC-1)<br /></li>
+<li>QAAC encoder is now using <code>--cvbr</code> instead of <code>--abr</code> when &quot;ABR&quot; mode is selected<br /></li>
 <li>Enable the embedding of cover artwork for Opus encoder (opusenc), using the <code>--picture</code> option<br /></li>
 <li>Some installer improvements have been implemented (especially in &quot;update&quot; mode)<br /></li>
 <li>Full support for Windows 10 RTM (Build #10240)</li>

diff --git a/doc/Changelog.md b/doc/Changelog.md
index caf9379..335d61e 100644 (file)
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -21,6 +21,8 @@
 * Updated GnuPG to v1.4.19 (2015-02-27), compiled with GCC 4.9.2
 * Fixed potential deadlock in Cue Sheet import dialog when "Browse..." button is clicked
 * Fixed function to restore the default Temp folder, if custom Temp folder doesn't exist anymore
+* Fixed parsing of command-line parameters, regression in MUtilities library (LameXP v4.12 RC-1)
+* QAAC encoder is now using `--cvbr` instead of `--abr` when "ABR" mode is selected
 * Enable the embedding of cover artwork for Opus encoder (opusenc), using the ``--picture`` option
 * Some installer improvements have been implemented (especially in "update" mode)
 * Full support for Windows 10 RTM (Build #10240)

diff --git a/src/Config.h b/src/Config.h
index 07608fb..5e6dd31 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI                                    1
 #define VER_LAMEXP_MINOR_LO                                    2
 #define VER_LAMEXP_TYPE                                                RC
-#define VER_LAMEXP_PATCH                                       3
-#define VER_LAMEXP_BUILD                                       1810
+#define VER_LAMEXP_PATCH                                       4
+#define VER_LAMEXP_BUILD                                       1812
 #define VER_LAMEXP_CONFG                                       1700
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Encoder_AAC_QAAC.cpp b/src/Encoder_AAC_QAAC.cpp
index c5aee18..2bf7bca 100644 (file)
--- a/src/Encoder_AAC_QAAC.cpp
+++ b/src/Encoder_AAC_QAAC.cpp
@@ -179,7 +179,7 @@ bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInf
                args << "--cbr" << QString::number(qBound(8, index2bitrate(m_configBitrate), 576));
                break;
        case SettingsModel::ABRMode:
-               args << "--abr" << QString::number(qBound(8, index2bitrate(m_configBitrate), 576));
+               args << "--cvbr" << QString::number(qBound(8, index2bitrate(m_configBitrate), 576));
                break;
        case SettingsModel::VBRMode:
                args << "--tvbr" << QString::number(g_qaacVBRQualityLUT[qBound(0, m_configBitrate , 14)]);