From cde4d54680d8de067fd1dccc2cff3f7265250674 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sat, 4 Nov 2017 21:06:40 +0100
Subject: [PATCH] Fixed reading duration + some code refactoring.

---
 doc/Changelog.html               |   2 +-
 doc/Changelog.md                 |   2 +-
 src/Config.h                     |   4 +-
 src/Thread_FileAnalyzer_Task.cpp | 171 ++++++++++++++-----------------
 src/Thread_FileAnalyzer_Task.h   |   2 +-
 5 files changed, 80 insertions(+), 101 deletions(-)

diff --git a/doc/Changelog.html b/doc/Changelog.html
index a613bb53..ad7610d5 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -3,7 +3,7 @@
 h='&#x67;&#x6d;&#120;';a='&#64;';n='&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;';e=n+a+h;
 document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
 // -->
-</script><noscript>&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;&#32;&#x61;&#116;&#32;&#x67;&#x6d;&#120;</noscript>&gt; | <a href="http://muldersoft.com/" class="uri">http://muldersoft.com/</a></h2> </header> <nav id="TOC"> <ul> <li><a href="#lamexp-v4.xx-history"><span class="toc-section-number">1</span> LameXP v4.xx History</a><ul> <li><a href="#lamexp-v4.16-unreleased">LameXP v4.16 [UNRELEASED]</a></li> <li><a href="#lamexp-v4.15-2017-05-31">LameXP v4.15 [2017-05-31]</a></li> <li><a href="#lamexp-v4.14-2016-11-19">LameXP v4.14 [2016-11-19]</a></li> <li><a href="#lamexp-v4.13-2015-12-12">LameXP v4.13 [2015-12-12]</a></li> <li><a href="#lamexp-v4.12-2015-10-23">LameXP v4.12 [2015-10-23]</a></li> <li><a href="#lamexp-v4.11-2015-04-05">LameXP v4.11 [2015-04-05]</a></li> <li><a href="#lamexp-v4.10-2014-06-23">LameXP v4.10 [2014-06-23]</a></li> <li><a href="#lamexp-v4.09-2014-01-26">LameXP v4.09 [2014-01-26]</a></li> <li><a href="#lamexp-v4.08-2013-09-04">LameXP v4.08 [2013-09-04]</a></li> <li><a href="#lamexp-v4.07-2013-04-28">LameXP v4.07 [2013-04-28]</a></li> <li><a href="#lamexp-v4.06-2012-11-04">LameXP v4.06 [2012-11-04]</a></li> <li><a href="#lamexp-v4.05-2012-09-03">LameXP v4.05 [2012-09-03]</a></li> <li><a href="#lamexp-v4.04-2012-04-26">LameXP v4.04 [2012-04-26]</a></li> <li><a href="#lamexp-v4.03-2011-11-12">LameXP v4.03 [2011-11-12]</a></li> <li><a href="#lamexp-v4.02-2011-06-14">LameXP v4.02 [2011-06-14]</a></li> <li><a href="#lamexp-v4.01-2011-04-04">LameXP v4.01 [2011-04-04]</a></li> <li><a href="#lamexp-v4.00-2011-02-21">LameXP v4.00 [2011-02-21]</a></li> </ul></li> <li><a href="#lamexp-v3.xx-history"><span class="toc-section-number">2</span> LameXP v3.xx History</a><ul> <li><a href="#lamexp-v3.19-2010-07-12">LameXP v3.19 [2010-07-12]</a></li> <li><a href="#lamexp-v3.18-2010-05-08">LameXP v3.18 [2010-05-08]</a></li> <li><a href="#lamexp-v3.17-2010-02-21">LameXP v3.17 [2010-02-21]</a></li> <li><a href="#lamexp-v3.16-2010-01-26">LameXP v3.16 [2010-01-26]</a></li> <li><a href="#lamexp-v3.15-2009-12-24">LameXP v3.15 [2009-12-24]</a></li> <li><a href="#lamexp-v3.14-2009-12-01">LameXP v3.14 [2009-12-01]</a></li> <li><a href="#lamexp-v3.13-2009-10-21">LameXP v3.13 [2009-10-21]</a></li> <li><a href="#lamexp-v3.12-2009-09-19">LameXP v3.12 [2009-09-19]</a></li> <li><a href="#lamexp-v3.11-2009-06-22">LameXP v3.11 [2009-06-22]</a></li> <li><a href="#lamexp-v3.10-2009-06-11">LameXP v3.10 [2009-06-11]</a></li> <li><a href="#lamexp-v3.09-2009-06-01">LameXP v3.09 [2009-06-01]</a></li> <li><a href="#lamexp-v3.08-2009-03-05">LameXP v3.08 [2009-03-05]</a></li> <li><a href="#lamexp-v3.07-2008-12-24">LameXP v3.07 [2008-12-24]</a></li> <li><a href="#lamexp-v3.06-2008-10-26">LameXP v3.06 [2008-10-26]</a></li> <li><a href="#lamexp-v3.05-2008-10-11">LameXP v3.05 [2008-10-11]</a></li> <li><a href="#lamexp-v3.04-2008-09-26">LameXP v3.04 [2008-09-26]</a></li> <li><a href="#lamexp-v3.03-2008-08-12">LameXP v3.03 [2008-08-12]</a></li> <li><a href="#lamexp-v3.02-2008-08-06">LameXP v3.02 [2008-08-06]</a></li> <li><a href="#lamexp-v3.01-2008-08-01">LameXP v3.01 [2008-08-01]</a></li> <li><a href="#lamexp-v3.00-2008-07-04">LameXP v3.00 [2008-07-04]</a></li> </ul></li> <li><a href="#lamexp-v2.xx-history"><span class="toc-section-number">3</span> LameXP v2.xx History</a><ul> <li><a href="#lamexp-v2.03-2007-08-17">LameXP v2.03 [2007-08-17]</a></li> <li><a href="#lamexp-v2.00-2007-02-19">LameXP v2.00 [2007-02-19]</a></li> </ul></li> <li><a href="#lamexp-v1.xx-history"><span class="toc-section-number">4</span> LameXP v1.xx History</a><ul> <li><a href="#lamexp-v1.00-2004-12-10">LameXP v1.00 [2004-12-10]</a></li> </ul></li> </ul> </nav> <h1 id="lamexp-v4.xx-history"><span class="header-section-number">1</span> LameXP v4.xx History</h1> <h2 id="lamexp-v4.16-unreleased" class="unnumbered">LameXP v4.16 [UNRELEASED]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2017 with Update-4</li> <li>Updated LAME encoder to v3.100 Final (2017-10-13), compiled with ICL 18.0 and MSVC 14.1</li> <li>Updated mpg123 decoder to v1.25.7 (2017-09-25), compiled with GCC 7.2.0</li> <li>Updated Opus encoder/decoder libraries to v1.2.1 (2017-07-26) and Opus-Tools to v0.1.10 (2017-05-25)</li> <li>Updated MediaInfo to v0.7.99 (2017-09-11), compiled with ICL 18.0 and MSVC 14.1</li> <li>Updated GnuPG to v1.4.22 (2017-07-19), compiled with GCC 7.2.0</li> <li>Complete re-write of MediaInfo parsing code, now using XML-based MediaInfo output</li> <li>Improved auto-detection of max. parallel instances on computers with SSD (or similar) drive</li> <li>Some improvements to output file name generation code</li> </ul> <h2 id="lamexp-v4.15-2017-05-31" class="unnumbered">LameXP v4.15 [2017-05-31]</h2> <ul> <li>Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators</li> <li>Fixed included MediaInfo binary not working on processor <em>without</em> SSE2 support</li> <li>Improved file name generation from meta-tags containing characters that are forbidden in file names</li> <li>Some improvements for &quot;high DPI&quot; screens: Adjust initial window size according to DPI setting</li> <li>Updated Opus encoder/decoder libraries to v1.2-beta (2017-05-26) and Opus-Tools to v0.1.10 (2017-05-25)</li> <li>Updated MediaInfo to v0.7.95 (2017-05-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated SoX to v14.4.2 (2015-02-22) with Dynamic Audio Normalizer v2.10 (2017-04-14) effect included</li> <li>Updated mpg123 decoder to v1.24.0 (2017-03-02), compiled with GCC 6.3.0</li> <li>Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11)</li> <li>Updated Monkey's Audio binary to v4.25 (2017-03-12), compiled with ICL 17.0 and MSVC 14.0</li> <li>Some tweaks to the auto-update function in order to speed-up the update check in most situations</li> </ul> <h2 id="lamexp-v4.14-2016-11-19" class="unnumbered">LameXP v4.14 [2016-11-19]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-3</li> <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li> <li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li> <li>Fixed encoding of <em>non</em>-Stereo sources with NeroAAC, when &quot;HE-AAC <em>v2</em> (SBR+PS)&quot; is selected</li> <li>Fixed a bug that would cause the encoding job to fail, when an audio filter is <em>skipped</em></li> <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li> <li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha and Opus-Tools to v0.1.9 (2016-11-04)</li> <li>Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated FLAC encoder/decoder to v1.3.1 (2016-10-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated MediaInfo to v0.7.90 (2016-10-31), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated mpg123 decoder to v1.23.8 (2016-09-27), compiled with GCC 6.2.0</li> <li>Updated ALAC decoder to refalac v1.61 (2016-10-02)</li> <li>Updated WavPack decoder to v4.80.0 (2016-03-28), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated GnuPG to v1.4.21 (2016-08-17), compiled with GCC 6.1.0</li> <li>Updated QAAC add-in to the to QAAC v2.61 (2016-10-02)</li> <li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li> <li>Improved auto-update function (faster Internet connectivity check)</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-1</li> <li>Apply the original file's &quot;creation&quot; and &quot;last modified&quot; date/time to the output file (optional)</li> <li>Updated Vorbis encoder to OggEnc v2.88 (2015-09-10), using libvorbis v1.3.5 and aoTuV b6.03_2015</li> <li>Updated MediaInfo to v0.7.78 (2015-10-02), compiled with ICL 15.0 and MSVC 12.0</li> <li>Fixed resampling bug with Vorbis encoder, regression in OggEnc v2.87</li> <li>Fixed creation of Monkey's Audio (APE) files, when <strong>no</strong> meta data is being embedded</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.12-2015-10-23" class="unnumbered">LameXP v4.12 [2015-10-23]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2013 with Update-5</li> <li>Updated Qt runtime libraries to v4.8.7 Final (2015-05-25), compiled with MSVC 12.0</li> <li>Added support for building LameXP and MUtilities with Visual Studio 2015</li> <li>Added Hungarian translation, contributed by Zityi's Translator Team &lt;<script type="text/javascript">
+</script><noscript>&#x6d;&#x75;&#108;&#100;&#x65;&#114;&#50;&#32;&#x61;&#116;&#32;&#x67;&#x6d;&#120;</noscript>&gt; | <a href="http://muldersoft.com/" class="uri">http://muldersoft.com/</a></h2> </header> <nav id="TOC"> <ul> <li><a href="#lamexp-v4.xx-history"><span class="toc-section-number">1</span> LameXP v4.xx History</a><ul> <li><a href="#lamexp-v4.16-unreleased">LameXP v4.16 [UNRELEASED]</a></li> <li><a href="#lamexp-v4.15-2017-05-31">LameXP v4.15 [2017-05-31]</a></li> <li><a href="#lamexp-v4.14-2016-11-19">LameXP v4.14 [2016-11-19]</a></li> <li><a href="#lamexp-v4.13-2015-12-12">LameXP v4.13 [2015-12-12]</a></li> <li><a href="#lamexp-v4.12-2015-10-23">LameXP v4.12 [2015-10-23]</a></li> <li><a href="#lamexp-v4.11-2015-04-05">LameXP v4.11 [2015-04-05]</a></li> <li><a href="#lamexp-v4.10-2014-06-23">LameXP v4.10 [2014-06-23]</a></li> <li><a href="#lamexp-v4.09-2014-01-26">LameXP v4.09 [2014-01-26]</a></li> <li><a href="#lamexp-v4.08-2013-09-04">LameXP v4.08 [2013-09-04]</a></li> <li><a href="#lamexp-v4.07-2013-04-28">LameXP v4.07 [2013-04-28]</a></li> <li><a href="#lamexp-v4.06-2012-11-04">LameXP v4.06 [2012-11-04]</a></li> <li><a href="#lamexp-v4.05-2012-09-03">LameXP v4.05 [2012-09-03]</a></li> <li><a href="#lamexp-v4.04-2012-04-26">LameXP v4.04 [2012-04-26]</a></li> <li><a href="#lamexp-v4.03-2011-11-12">LameXP v4.03 [2011-11-12]</a></li> <li><a href="#lamexp-v4.02-2011-06-14">LameXP v4.02 [2011-06-14]</a></li> <li><a href="#lamexp-v4.01-2011-04-04">LameXP v4.01 [2011-04-04]</a></li> <li><a href="#lamexp-v4.00-2011-02-21">LameXP v4.00 [2011-02-21]</a></li> </ul></li> <li><a href="#lamexp-v3.xx-history"><span class="toc-section-number">2</span> LameXP v3.xx History</a><ul> <li><a href="#lamexp-v3.19-2010-07-12">LameXP v3.19 [2010-07-12]</a></li> <li><a href="#lamexp-v3.18-2010-05-08">LameXP v3.18 [2010-05-08]</a></li> <li><a href="#lamexp-v3.17-2010-02-21">LameXP v3.17 [2010-02-21]</a></li> <li><a href="#lamexp-v3.16-2010-01-26">LameXP v3.16 [2010-01-26]</a></li> <li><a href="#lamexp-v3.15-2009-12-24">LameXP v3.15 [2009-12-24]</a></li> <li><a href="#lamexp-v3.14-2009-12-01">LameXP v3.14 [2009-12-01]</a></li> <li><a href="#lamexp-v3.13-2009-10-21">LameXP v3.13 [2009-10-21]</a></li> <li><a href="#lamexp-v3.12-2009-09-19">LameXP v3.12 [2009-09-19]</a></li> <li><a href="#lamexp-v3.11-2009-06-22">LameXP v3.11 [2009-06-22]</a></li> <li><a href="#lamexp-v3.10-2009-06-11">LameXP v3.10 [2009-06-11]</a></li> <li><a href="#lamexp-v3.09-2009-06-01">LameXP v3.09 [2009-06-01]</a></li> <li><a href="#lamexp-v3.08-2009-03-05">LameXP v3.08 [2009-03-05]</a></li> <li><a href="#lamexp-v3.07-2008-12-24">LameXP v3.07 [2008-12-24]</a></li> <li><a href="#lamexp-v3.06-2008-10-26">LameXP v3.06 [2008-10-26]</a></li> <li><a href="#lamexp-v3.05-2008-10-11">LameXP v3.05 [2008-10-11]</a></li> <li><a href="#lamexp-v3.04-2008-09-26">LameXP v3.04 [2008-09-26]</a></li> <li><a href="#lamexp-v3.03-2008-08-12">LameXP v3.03 [2008-08-12]</a></li> <li><a href="#lamexp-v3.02-2008-08-06">LameXP v3.02 [2008-08-06]</a></li> <li><a href="#lamexp-v3.01-2008-08-01">LameXP v3.01 [2008-08-01]</a></li> <li><a href="#lamexp-v3.00-2008-07-04">LameXP v3.00 [2008-07-04]</a></li> </ul></li> <li><a href="#lamexp-v2.xx-history"><span class="toc-section-number">3</span> LameXP v2.xx History</a><ul> <li><a href="#lamexp-v2.03-2007-08-17">LameXP v2.03 [2007-08-17]</a></li> <li><a href="#lamexp-v2.00-2007-02-19">LameXP v2.00 [2007-02-19]</a></li> </ul></li> <li><a href="#lamexp-v1.xx-history"><span class="toc-section-number">4</span> LameXP v1.xx History</a><ul> <li><a href="#lamexp-v1.00-2004-12-10">LameXP v1.00 [2004-12-10]</a></li> </ul></li> </ul> </nav> <h1 id="lamexp-v4.xx-history"><span class="header-section-number">1</span> LameXP v4.xx History</h1> <h2 id="lamexp-v4.16-unreleased" class="unnumbered">LameXP v4.16 [UNRELEASED]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2017 with Update-4</li> <li>Updated LAME encoder to v3.100 Final (2017-10-13), compiled with ICL 18.0 and MSVC 14.1</li> <li>Updated mpg123 decoder to v1.25.7 (2017-09-25), compiled with GCC 7.2.0</li> <li>Updated Opus encoder/decoder libraries to v1.2.1 (2017-07-26) and Opus-Tools to v0.1.10 (2017-05-25)</li> <li>Updated MediaInfo to v17.10 (2017-11-02), compiled with ICL 18.0 and MSVC 14.1</li> <li>Updated GnuPG to v1.4.22 (2017-07-19), compiled with GCC 7.2.0</li> <li>Complete re-write of MediaInfo parsing code, now using XML-based MediaInfo output</li> <li>Improved auto-detection of max. parallel instances on computers with SSD (or similar) drive</li> <li>Some improvements to output file name generation code</li> </ul> <h2 id="lamexp-v4.15-2017-05-31" class="unnumbered">LameXP v4.15 [2017-05-31]</h2> <ul> <li>Fixed a bug in auto-rename feature, that caused problems when a meta-tag contained path separators</li> <li>Fixed included MediaInfo binary not working on processor <em>without</em> SSE2 support</li> <li>Improved file name generation from meta-tags containing characters that are forbidden in file names</li> <li>Some improvements for &quot;high DPI&quot; screens: Adjust initial window size according to DPI setting</li> <li>Updated Opus encoder/decoder libraries to v1.2-beta (2017-05-26) and Opus-Tools to v0.1.10 (2017-05-25)</li> <li>Updated MediaInfo to v0.7.95 (2017-05-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated SoX to v14.4.2 (2015-02-22) with Dynamic Audio Normalizer v2.10 (2017-04-14) effect included</li> <li>Updated mpg123 decoder to v1.24.0 (2017-03-02), compiled with GCC 6.3.0</li> <li>Updated FAAD decoder to v2.7 from CVS in order to include latest libFAAD fixes (2016-11-11)</li> <li>Updated Monkey's Audio binary to v4.25 (2017-03-12), compiled with ICL 17.0 and MSVC 14.0</li> <li>Some tweaks to the auto-update function in order to speed-up the update check in most situations</li> </ul> <h2 id="lamexp-v4.14-2016-11-19" class="unnumbered">LameXP v4.14 [2016-11-19]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-3</li> <li>Fixed the location of temporary intermediate files for SoX-based audio effects</li> <li>Fixed embedding of meta tags with OggEnc2 when reading directly from OGG/FLAC input file</li> <li>Fixed encoding of <em>non</em>-Stereo sources with NeroAAC, when &quot;HE-AAC <em>v2</em> (SBR+PS)&quot; is selected</li> <li>Fixed a bug that would cause the encoding job to fail, when an audio filter is <em>skipped</em></li> <li>Enabled the &quot;built-in&quot; resampler for QAAC encoder</li> <li>The &quot;Algorithm Quality&quot; slider now also affects the QAAC encoder</li> <li>Added &quot;AVX&quot; (Advanced Vector Extensions) to CPU feature detection code</li> <li>Updated Opus encoder/decoder libraries to v1.2-alpha and Opus-Tools to v0.1.9 (2016-11-04)</li> <li>Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated FLAC encoder/decoder to v1.3.1 (2016-10-04), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated MediaInfo to v0.7.90 (2016-10-31), compiled with ICL 17.0 and MSVC 12.0</li> <li>Updated mpg123 decoder to v1.23.8 (2016-09-27), compiled with GCC 6.2.0</li> <li>Updated ALAC decoder to refalac v1.61 (2016-10-02)</li> <li>Updated WavPack decoder to v4.80.0 (2016-03-28), compiled with ICL 15.0 and MSVC 12.0</li> <li>Updated GnuPG to v1.4.21 (2016-08-17), compiled with GCC 6.1.0</li> <li>Updated QAAC add-in to the to QAAC v2.61 (2016-10-02)</li> <li>Updated FhgAacEnc add-in to &quot;Case&quot; edition (2015-10-24)</li> <li>Improved auto-update function (faster Internet connectivity check)</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.13-2015-12-12" class="unnumbered">LameXP v4.13 [2015-12-12]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2015 with Update-1</li> <li>Apply the original file's &quot;creation&quot; and &quot;last modified&quot; date/time to the output file (optional)</li> <li>Updated Vorbis encoder to OggEnc v2.88 (2015-09-10), using libvorbis v1.3.5 and aoTuV b6.03_2015</li> <li>Updated MediaInfo to v0.7.78 (2015-10-02), compiled with ICL 15.0 and MSVC 12.0</li> <li>Fixed resampling bug with Vorbis encoder, regression in OggEnc v2.87</li> <li>Fixed creation of Monkey's Audio (APE) files, when <strong>no</strong> meta data is being embedded</li> <li>Updated language files (big thank-you to all contributors !!!)</li> </ul> <h2 id="lamexp-v4.12-2015-10-23" class="unnumbered">LameXP v4.12 [2015-10-23]</h2> <ul> <li>Upgraded build environment to Microsoft Visual Studio 2013 with Update-5</li> <li>Updated Qt runtime libraries to v4.8.7 Final (2015-05-25), compiled with MSVC 12.0</li> <li>Added support for building LameXP and MUtilities with Visual Studio 2015</li> <li>Added Hungarian translation, contributed by Zityi's Translator Team &lt;<script type="text/javascript">
 <!--
 h='&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#x6d;';a='&#64;';n='&#122;&#x69;&#116;&#x79;&#x69;&#x73;&#x6f;&#102;&#116;';e=n+a+h;
 document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
diff --git a/doc/Changelog.md b/doc/Changelog.md
index e566c9fd..0d565916 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -10,7 +10,7 @@ LameXP Audio-Encoder Front-End &ndash; Changelog
 * Updated LAME encoder to v3.100 Final (2017-10-13), compiled with ICL 18.0 and MSVC 14.1
 * Updated mpg123 decoder to v1.25.7 (2017-09-25), compiled with GCC 7.2.0
 * Updated Opus encoder/decoder libraries to v1.2.1 (2017-07-26) and Opus-Tools to v0.1.10 (2017-05-25)
-* Updated MediaInfo to v0.7.99 (2017-09-11), compiled with ICL 18.0 and MSVC 14.1
+* Updated MediaInfo to v17.10 (2017-11-02), compiled with ICL 18.0 and MSVC 14.1
 * Updated GnuPG to v1.4.22 (2017-07-19), compiled with GCC 7.2.0
 * Complete re-write of MediaInfo parsing code, now using XML-based MediaInfo output
 * Improved auto-detection of max. parallel instances on computers with SSD (or similar) drive
diff --git a/src/Config.h b/src/Config.h
index 4c512e0e..59ee641e 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI					1
 #define VER_LAMEXP_MINOR_LO					6
 #define VER_LAMEXP_TYPE						Alpha
-#define VER_LAMEXP_PATCH					8
-#define VER_LAMEXP_BUILD					2050
+#define VER_LAMEXP_PATCH					9
+#define VER_LAMEXP_BUILD					2054
 #define VER_LAMEXP_CONFG					2002
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Thread_FileAnalyzer_Task.cpp b/src/Thread_FileAnalyzer_Task.cpp
index e099d61c..fa15d5e1 100644
--- a/src/Thread_FileAnalyzer_Task.cpp
+++ b/src/Thread_FileAnalyzer_Task.cpp
@@ -71,7 +71,6 @@ while(0)
 } \
 while(0)
 
-
 #define SET_OPTIONAL(TYPE, IF_CMD, THEN_CMD) do \
 { \
 	TYPE _tmp;\
@@ -79,86 +78,71 @@ while(0)
 } \
 while(0)
 
+#define DIV_RND(A,B) (((A) + ((B) / 2U)) / (B))
 #define STRICMP(A,B) ((A).compare((B), Qt::CaseInsensitive) == 0)
 
 ////////////////////////////////////////////////////////////
 // Static initialization
 ////////////////////////////////////////////////////////////
 
-class AnalyzeTask_StaticInit_MediaInfoIdx : public MUtils::Lazy<const QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t>>
+static MUtils::Lazy<const QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t>> s_mediaInfoIdx([]
 {
-	virtual QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t> *create()
-	{
-		QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t> *const builder = new QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t>();
-		ADD_PROPTERY_MAPPING_2(gen, format, container);
-		ADD_PROPTERY_MAPPING_2(gen, format_profile, container_profile);
-		ADD_PROPTERY_MAPPING_1(gen, duration);
-		ADD_PROPTERY_MAPPING_1(gen, title);
-		ADD_PROPTERY_MAPPING_2(gen, track, title);
-		ADD_PROPTERY_MAPPING_1(gen, artist);
-		ADD_PROPTERY_MAPPING_2(gen, performer, artist);
-		ADD_PROPTERY_MAPPING_1(gen, album);
-		ADD_PROPTERY_MAPPING_1(gen, genre);
-		ADD_PROPTERY_MAPPING_1(gen, released_date);
-		ADD_PROPTERY_MAPPING_2(gen, recorded_date, released_date);
-		ADD_PROPTERY_MAPPING_1(gen, track_position);
-		ADD_PROPTERY_MAPPING_1(gen, comment);
-		ADD_PROPTERY_MAPPING_1(aud, format);
-		ADD_PROPTERY_MAPPING_1(aud, format_version);
-		ADD_PROPTERY_MAPPING_1(aud, format_profile);
-		ADD_PROPTERY_MAPPING_1(aud, duration);
-		ADD_PROPTERY_MAPPING_1(aud, channel_s_);
-		ADD_PROPTERY_MAPPING_1(aud, samplingrate);
-		ADD_PROPTERY_MAPPING_1(aud, bitdepth);
-		ADD_PROPTERY_MAPPING_1(aud, bitrate);
-		ADD_PROPTERY_MAPPING_1(aud, bitrate_mode);
-		ADD_PROPTERY_MAPPING_1(aud, encoded_library);
-		ADD_PROPTERY_MAPPING_2(gen, cover_mime, cover_mime);
-		ADD_PROPTERY_MAPPING_2(gen, cover_data, cover_data);
-		return builder;
-	}
-}
-s_mediaInfoIdx;
+	QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t> *const builder = new QMap<QPair<AnalyzeTask::MI_trackType_t, QString>, AnalyzeTask::MI_propertyId_t>();
+	ADD_PROPTERY_MAPPING_2(gen, format, container);
+	ADD_PROPTERY_MAPPING_2(gen, format_profile, container_profile);
+	ADD_PROPTERY_MAPPING_1(gen, duration);
+	ADD_PROPTERY_MAPPING_1(gen, title);
+	ADD_PROPTERY_MAPPING_2(gen, track, title);
+	ADD_PROPTERY_MAPPING_1(gen, artist);
+	ADD_PROPTERY_MAPPING_2(gen, performer, artist);
+	ADD_PROPTERY_MAPPING_1(gen, album);
+	ADD_PROPTERY_MAPPING_1(gen, genre);
+	ADD_PROPTERY_MAPPING_1(gen, released_date);
+	ADD_PROPTERY_MAPPING_2(gen, recorded_date, released_date);
+	ADD_PROPTERY_MAPPING_1(gen, track_position);
+	ADD_PROPTERY_MAPPING_1(gen, comment);
+	ADD_PROPTERY_MAPPING_1(aud, format);
+	ADD_PROPTERY_MAPPING_1(aud, format_version);
+	ADD_PROPTERY_MAPPING_1(aud, format_profile);
+	ADD_PROPTERY_MAPPING_1(aud, duration);
+	ADD_PROPTERY_MAPPING_1(aud, channel_s_);
+	ADD_PROPTERY_MAPPING_1(aud, samplingrate);
+	ADD_PROPTERY_MAPPING_1(aud, bitdepth);
+	ADD_PROPTERY_MAPPING_1(aud, bitrate);
+	ADD_PROPTERY_MAPPING_1(aud, bitrate_mode);
+	ADD_PROPTERY_MAPPING_1(aud, encoded_library);
+	ADD_PROPTERY_MAPPING_2(gen, cover_mime, cover_mime);
+	ADD_PROPTERY_MAPPING_2(gen, cover_data, cover_data);
+	return builder;
+});
 
-class AnalyzeTask_StaticInit_AvisynthIdx : public MUtils::Lazy<const QMap<QString, AnalyzeTask::MI_propertyId_t>>
+static MUtils::Lazy<const QMap<QString, AnalyzeTask::MI_propertyId_t>> s_avisynthIdx([]
 {
-	virtual QMap<QString, AnalyzeTask::MI_propertyId_t> *create()
-	{
-		QMap<QString, AnalyzeTask::MI_propertyId_t> *const builder = new QMap<QString, AnalyzeTask::MI_propertyId_t>();
-		builder->insert(QLatin1String("totalseconds"), AnalyzeTask::propertyId_duration);
-		builder->insert(QLatin1String("samplespersec"), AnalyzeTask::propertyId_samplingrate);
-		builder->insert(QLatin1String("channels"), AnalyzeTask::propertyId_channel_s_);
-		builder->insert(QLatin1String("bitspersample"), AnalyzeTask::propertyId_bitdepth);
-		return builder;
-	}
-}
-s_avisynthIdx;
+	QMap<QString, AnalyzeTask::MI_propertyId_t> *const builder = new QMap<QString, AnalyzeTask::MI_propertyId_t>();
+	builder->insert(QLatin1String("totalseconds"),  AnalyzeTask::propertyId_duration);
+	builder->insert(QLatin1String("samplespersec"), AnalyzeTask::propertyId_samplingrate);
+	builder->insert(QLatin1String("channels"),      AnalyzeTask::propertyId_channel_s_);
+	builder->insert(QLatin1String("bitspersample"), AnalyzeTask::propertyId_bitdepth);
+	return builder;
+});
 
-class AnalyzeTask_StaticInit_MimiTypes : public MUtils::Lazy<const QMap<QString, QString>>
+static MUtils::Lazy<const QMap<QString, QString>> s_mimeTypes([]
 {
-	virtual QMap<QString, QString> *create()
+	QMap<QString, QString> *const builder = new QMap<QString, QString>();
+	for (size_t i = 0U; MIME_TYPES[i].type; ++i)
 	{
-		QMap<QString, QString> *const builder = new QMap<QString, QString>();
-		for (size_t i = 0U; MIME_TYPES[i].type; ++i)
-		{
-			builder->insert(QString::fromLatin1(MIME_TYPES[i].type), QString::fromLatin1(MIME_TYPES[i].ext[0]));
-		}
-		return builder;
+		builder->insert(QString::fromLatin1(MIME_TYPES[i].type), QString::fromLatin1(MIME_TYPES[i].ext[0]));
 	}
-}
-s_mimeTypes;
+	return builder;
+});
 
-class AnalyzeTask_StaticInit_TrackTypes : public MUtils::Lazy<const QMap<QString, AnalyzeTask::MI_trackType_t>>
+static MUtils::Lazy<const QMap<QString, AnalyzeTask::MI_trackType_t>> s_trackTypes([]
 {
-	virtual QMap<QString, AnalyzeTask::MI_trackType_t> *create()
-	{
-		QMap<QString, AnalyzeTask::MI_trackType_t> *const builder = new QMap<QString, AnalyzeTask::MI_trackType_t>();
-		builder->insert("general", AnalyzeTask::trackType_gen);
-		builder->insert("audio", AnalyzeTask::trackType_aud);
-		return builder;
-	}
-}
-s_trackTypes;
+	QMap<QString, AnalyzeTask::MI_trackType_t> *const builder = new QMap<QString, AnalyzeTask::MI_trackType_t>();
+	builder->insert("general", AnalyzeTask::trackType_gen);
+	builder->insert("audio",   AnalyzeTask::trackType_aud);
+	return builder;
+});
 
 ////////////////////////////////////////////////////////////
 // Constructor
@@ -402,7 +386,6 @@ const AudioFileModel& AnalyzeTask::parseMediaInfo(const QByteArray &data, AudioF
 			}
 			while (findNextElement(QLatin1String("Media"), xmlStream))
 			{
-				qWarning("Found a media!");
 				if (firstMediaFile || audioFile.techInfo().containerType().isEmpty() || audioFile.techInfo().audioType().isEmpty())
 				{
 					firstMediaFile = false;
@@ -453,7 +436,6 @@ void AnalyzeTask::parseFileInfo(QXmlStreamReader &xmlStream, AudioFileModel &aud
 	MI_trackType_t trackType;
 	while (findNextElement(QLatin1String("Track"), xmlStream))
 	{
-		qWarning("Found a track!");
 		const QString typeString = findAttribute(QLatin1String("Type"), xmlStream.attributes());
 		if ((trackType = m_trackTypes.value(typeString.toLower(), MI_trackType_t(-1))) != MI_trackType_t(-1))
 		{
@@ -505,27 +487,27 @@ void AnalyzeTask::parseProperty(const QString &value, const MI_propertyId_t prop
 #endif
 	switch (propertyIdx)
 	{
-		case propertyId_container:         audioFile.techInfo().setContainerType(value);                                                     return;
-		case propertyId_container_profile: audioFile.techInfo().setContainerProfile(value);                                                  return;
-		case propertyId_duration:          SET_OPTIONAL(quint32, parseDuration(value, _tmp), audioFile.techInfo().setDuration(_tmp));        return;
-		case propertyId_title:             audioFile.metaInfo().setTitle(value);                                                             return;
-		case propertyId_artist:            audioFile.metaInfo().setArtist(value);                                                            return;
-		case propertyId_album:             audioFile.metaInfo().setAlbum(value);                                                             return;
-		case propertyId_genre:             audioFile.metaInfo().setGenre(value);                                                             return;
-		case propertyId_released_date:     SET_OPTIONAL(quint32, parseYear(value, _tmp), audioFile.metaInfo().setYear(_tmp));                return;
-		case propertyId_track_position:    SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.metaInfo().setPosition(_tmp));        return;
-		case propertyId_comment:           audioFile.metaInfo().setComment(value);                                                           return;
-		case propertyId_format:            audioFile.techInfo().setAudioType(value);                                                         return;
-		case propertyId_format_version:    audioFile.techInfo().setAudioVersion(value);                                                      return;
-		case propertyId_format_profile:    audioFile.techInfo().setAudioProfile(value);                                                      return;
-		case propertyId_channel_s_:        SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioChannels(_tmp));   return;
-		case propertyId_samplingrate:      SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioSamplerate(_tmp)); return;
-		case propertyId_bitdepth:          SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioBitdepth(_tmp));   return;
-		case propertyId_bitrate:           SET_OPTIONAL(quint32, parseDuration(value, _tmp), audioFile.techInfo().setAudioBitrate(_tmp));    return;
-		case propertyId_bitrate_mode:      SET_OPTIONAL(quint32, parseRCMode(value, _tmp), audioFile.techInfo().setAudioBitrateMode(_tmp));  return;
-		case propertyId_encoded_library:   audioFile.techInfo().setAudioEncodeLib(cleanAsciiStr(value));                                     return;
-		case propertyId_cover_mime:        coverMimeType = value;                                                                            return;
-		case propertyId_cover_data:        retrieveCover(audioFile, coverMimeType, value);                                                   return;
+		case propertyId_container:         audioFile.techInfo().setContainerType(value);                                                                  return;
+		case propertyId_container_profile: audioFile.techInfo().setContainerProfile(value);                                                               return;
+		case propertyId_duration:          SET_OPTIONAL(double, parseFloat(value, _tmp), audioFile.techInfo().setDuration(qRound(_tmp)));                 return;
+		case propertyId_title:             audioFile.metaInfo().setTitle(value);                                                                          return;
+		case propertyId_artist:            audioFile.metaInfo().setArtist(value);                                                                         return;
+		case propertyId_album:             audioFile.metaInfo().setAlbum(value);                                                                          return;
+		case propertyId_genre:             audioFile.metaInfo().setGenre(value);                                                                          return;
+		case propertyId_released_date:     SET_OPTIONAL(quint32, parseYear(value, _tmp), audioFile.metaInfo().setYear(_tmp));                             return;
+		case propertyId_track_position:    SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.metaInfo().setPosition(_tmp));                     return;
+		case propertyId_comment:           audioFile.metaInfo().setComment(value);                                                                        return;
+		case propertyId_format:            audioFile.techInfo().setAudioType(value);                                                                      return;
+		case propertyId_format_version:    audioFile.techInfo().setAudioVersion(value);                                                                   return;
+		case propertyId_format_profile:    audioFile.techInfo().setAudioProfile(value);                                                                   return;
+		case propertyId_channel_s_:        SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioChannels(_tmp));                return;
+		case propertyId_samplingrate:      SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioSamplerate(_tmp));              return;
+		case propertyId_bitdepth:          SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioBitdepth(_tmp));                return;
+		case propertyId_bitrate:           SET_OPTIONAL(quint32, parseUnsigned(value, _tmp), audioFile.techInfo().setAudioBitrate(DIV_RND(_tmp, 1000U))); return;
+		case propertyId_bitrate_mode:      SET_OPTIONAL(quint32, parseRCMode(value, _tmp), audioFile.techInfo().setAudioBitrateMode(_tmp));               return;
+		case propertyId_encoded_library:   audioFile.techInfo().setAudioEncodeLib(cleanAsciiStr(value));                                                  return;
+		case propertyId_cover_mime:        coverMimeType = value;                                                                                         return;
+		case propertyId_cover_data:        retrieveCover(audioFile, coverMimeType, value);                                                                return;
 		default: MUTILS_THROW_FMT("Invalid property ID: %d", propertyIdx);
 	}
 }
@@ -684,14 +666,11 @@ bool AnalyzeTask::parseUnsigned(const QString &str, quint32 &value)
 	value = str.toUInt(&okay);
 	return okay;
 }
-bool AnalyzeTask::parseDuration(const QString &str, quint32 &value)
+bool AnalyzeTask::parseFloat(const QString &str, double &value)
 {
-	if (parseUnsigned(str, value))
-	{
-		value = (value + 500U) / 1000U;
-		return true;
-	}
-	return false;
+	bool okay = false;
+	value = QLocale::c().toDouble(str, &okay);
+	return okay;
 }
 
 bool AnalyzeTask::parseYear(const QString &str, quint32 &value)
diff --git a/src/Thread_FileAnalyzer_Task.h b/src/Thread_FileAnalyzer_Task.h
index e4a65729..351f5011 100644
--- a/src/Thread_FileAnalyzer_Task.h
+++ b/src/Thread_FileAnalyzer_Task.h
@@ -112,7 +112,7 @@ private:
 
 	static QString decodeStr(const QString &str, const QString &encoding);
 	static bool parseUnsigned(const QString &str, quint32 &value);
-	static bool parseDuration(const QString &str, quint32 &value);
+	static bool parseFloat(const QString &str, double &value);
 	static bool parseYear(const QString &st, quint32 &valuer);
 	static bool parseRCMode(const QString &str, quint32 &value);
 	static QString cleanAsciiStr(const QString &str);