Updated FLAC encoder/decoder binaries to v1.3.1 (2014-11-26), compiled with ICL 15.0.

diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj
index ab9adc1..e2012f4 100644 (file)
--- a/LameXP_VS2013.vcxproj
+++ b/LameXP_VS2013.vcxproj
@@ -395,7 +395,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest
     <ClCompile Include="tmp\LameXP\QRC_Images.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Localization.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_A.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_B.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_A.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_B.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_C.cpp" />
@@ -1119,7 +1120,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\UIC_%(Filename).h;%(Outputs)</Outputs>
     </CustomBuild>
     <None Include="ReadMe.txt" />
-    <CustomBuild Include="res\Tools_Decd.qrc">
+    <CustomBuild Include="res\Tools_Decd_A.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1227,6 +1228,18 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_B.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LameXP.rc">

diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters
index b344e6d..2efdb2a 100644 (file)
--- a/LameXP_VS2013.vcxproj.filters
+++ b/LameXP_VS2013.vcxproj.filters
@@ -250,9 +250,6 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools_Encd_A.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd.cpp">
-      <Filter>Generated Files\QRC</Filter>
-    </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
@@ -406,6 +403,12 @@
     <ClCompile Include="tmp\LameXP\MOC_CustomEventFilter.cpp">
       <Filter>Generated Files\MOC</Filter>
     </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_A.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools_Decd_B.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Config.h">
@@ -686,9 +689,6 @@
     <CustomBuild Include="src\Encoder_AAC_FHG.h">
       <Filter>Header Files\Encoders</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools_Decd.qrc">
-      <Filter>Resources</Filter>
-    </CustomBuild>
     <CustomBuild Include="src\Thread_CPUObserver.h">
       <Filter>Header Files\Threads</Filter>
     </CustomBuild>
@@ -746,12 +746,18 @@
     <CustomBuild Include="src\Encoder_MAC.h">
       <Filter>Header Files\Encoders</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools_Decd_A.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
     <None Include="res\MainIcon.ico">
       <Filter>Miscellaneous</Filter>
     </None>
+    <None Include="res\Tools_Decd_B.qrc">
+      <Filter>Resources</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">

diff --git a/doc/Changelog.md b/doc/Changelog.md
index 6bcf755..f7e20c7 100644 (file)
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -12,6 +12,7 @@
 * Updated mpg123 decoder to v1.20.1 (2014-06-17), compiled with GCC 4.9.0
 * Updated Vorbis encoder to OggEnc v2.87 (2014-06-24), using libvorbis v1.3.4 and aoTuV b6.03_2014
 * Updated Vorbis decoder to OggDec v1.10.1 (2014-06-25), using libVorbis v1.3.4
+* Updated FLAC encoder/decoder to v1.3.1 (2014-11-26), compiled with ICL 15.0 and MSVC 12.0
 * Updated GnuPG to v1.4.18 (2014-06-30), compiled with GCC 4.9.1
 * Updated QAAC add-in to the latest to QAAC v2.44, including a [fix](https://github.com/nu774/qaac/commit/ad1e0ea9daed076531e96cfa3b82f290ba9eeb20) for the ``--artwork`` option
 * Fixed potential crash in Cue Sheet importer (occurred when *all* input files were missing)

diff --git a/res/Tools_Decd.qrc b/res/Tools_Decd.qrc
deleted file mode 100644 (file)
index 1b686aa..0000000
--- a/res/Tools_Decd.qrc
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource>
-    <file>tools/avs2wav.exe</file>
-    <file>tools/faad.exe</file>
-    <file>tools/mac.exe</file>
-    <file>tools/mpcdec.exe</file>
-    <file>tools/mpg123.exe</file>
-    <file>tools/oggdec.exe</file>
-    <file>tools/opusdec.i386.exe</file>
-    <file>tools/opusdec.sse2.exe</file>
-    <file>tools/refalac.exe</file>
-    <file>tools/shorten.exe</file>
-    <file>tools/speexdec.exe</file>
-    <file>tools/tta.exe</file>
-    <file>tools/valdec.exe</file>
-    <file>tools/wma2wav.exe</file>
-    <file>tools/wvunpack.exe</file>
-  </qresource>
-</RCC>

diff --git a/res/Tools_Encd_A.qrc b/res/Tools_Encd_A.qrc
index d4ddc8b..394a107 100644 (file)
--- a/res/Tools_Encd_A.qrc
+++ b/res/Tools_Encd_A.qrc
@@ -4,11 +4,7 @@
     <file>tools/aften.i386.exe</file>
     <file>tools/aften.sse2.exe</file>
     <file>tools/aften.x64.exe</file>
-    <file>tools/dcaenc.exe</file>
-    <file>tools/flac.exe</file>
     <file>tools/lame.i386.exe</file>
     <file>tools/lame.sse2.exe</file>
-    <file>tools/opusenc.i386.exe</file>
-    <file>tools/opusenc.sse2.exe</file>
   </qresource>
 </RCC>

diff --git a/res/Tools_Encd_B.qrc b/res/Tools_Encd_B.qrc
index cacd509..d5f9efa 100644 (file)
--- a/res/Tools_Encd_B.qrc
+++ b/res/Tools_Encd_B.qrc
@@ -1,6 +1,8 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
   <qresource>
-    <file>tools/oggenc2.i386.exe</file>
+    <file>tools/dcaenc.exe</file>
+    <file>tools/flac.i386.exe</file>
+    <file>tools/flac.x64.exe</file>
   </qresource>
 </RCC>

diff --git a/res/Tools_Encd_C.qrc b/res/Tools_Encd_C.qrc
index c63247e..d3a206d 100644 (file)
--- a/res/Tools_Encd_C.qrc
+++ b/res/Tools_Encd_C.qrc
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
   <qresource>
-    <file>tools/oggenc2.sse2.exe</file>
+    <file>tools/opusenc.i386.exe</file>
+    <file>tools/opusenc.sse2.exe</file>
   </qresource>
 </RCC>

diff --git a/res/Tools_Encd_D.qrc b/res/Tools_Encd_D.qrc
index 814f41d..5a5eba8 100644 (file)
--- a/res/Tools_Encd_D.qrc
+++ b/res/Tools_Encd_D.qrc
@@ -1,6 +1,8 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
   <qresource>
+    <file>tools/oggenc2.i386.exe</file>
+    <file>tools/oggenc2.sse2.exe</file>
     <file>tools/oggenc2.x64.exe</file>
   </qresource>
 </RCC>

diff --git a/res/tools/flac.exe b/res/tools/flac.exe
deleted file mode 100644 (file)
index e88ff43..0000000
Binary files a/res/tools/flac.exe and /dev/null differ

diff --git a/res/tools/flac.i386.exe b/res/tools/flac.i386.exe
new file mode 100644 (file)
index 0000000..c0a2000
Binary files /dev/null and b/res/tools/flac.i386.exe differ

diff --git a/res/tools/flac.x64.exe b/res/tools/flac.x64.exe
new file mode 100644 (file)
index 0000000..4653643
Binary files /dev/null and b/res/tools/flac.x64.exe differ

diff --git a/src/Config.h b/src/Config.h
index 70b7696..e8f913b 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    1
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       13
-#define VER_LAMEXP_BUILD                                       1672
+#define VER_LAMEXP_BUILD                                       1673
 #define VER_LAMEXP_CONFG                                       1558
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Tools.h b/src/Tools.h
index d4abe28..84e8c09 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -64,7 +64,8 @@ g_lamexp_tools[] =
        {"07834b1b8ecac2f3db79ad048005eca3a284cb759e15d399eb1a560a403122e20db5f08e60319759b8463aeef2410d02", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20120419, ""},
        {"7c249f507b96967bedabdd7e631638807a7595ebff58eaaadf63530783d515eda9660bc2b1a0457fddae7e3eaef8a074", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX, ""},
        {"bbc262cfe9c48633e5f1780d30347d7663075cfd7bdc76347cce3b1191d62f788d9b91bc63dffae2f66d1759d5849e92", CPU_TYPE_ALL_ALL, "faad.exe", 27, ""},
-       {"1f596224564452e66d0c717dfd776d0c4fa4fcc8650a424895a780b19d7acc8c8fb0f5c0501f2adfabc8a96da6074529", CPU_TYPE_ALL_ALL, "flac.exe", 130, ""},
+       {"36f9b021a8136664fce4c556571270f9151ca11d191b31630b0cad7b28107be2175909b8d28c903cb1c17d260c38d5de", CPU_TYPE_X86_ALL, "flac.i386.exe", 131, ""},
+       {"68e08fc34f981d183f243308791b5e158c28903a2052ca239bb9ad3d54d976c9ec7f0bb0b50c0aadfcefb4a1d0f63a18", CPU_TYPE_X64_ALL, "flac.x64.exe" , 131, ""},
        {"8aee1bdbeb9b0bfe0877504cb0c368a2eb98a71c184abdacc2b7e4d8472069da56ed3e06ca8f558598e250f778ff1c42", CPU_TYPE_ALL_ALL, "gpgv.exe", 1418, ""},
        {"19c9dbe9089491c1f59ae48016d95d4336c4d3743577db4e782d8b59eca3b2bda6ed8f92f9004f88f434935b79e4974b", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX, ""},
        {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"},