Updated Monkey's Audio binaries to v4.16 (2015-03-24), compiled with ICL 15.0 and...

diff --git a/doc/Changelog.html b/doc/Changelog.html
index 7a91ad9..d6d754d 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -99,6 +99,7 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+e+'<\/'+'a'+'>');
 <li>Updated MediaInfo to v0.7.76 (2015-08-06), compiled with ICL 15.0 and MSVC 12.0<br /></li>
 <li>Updated mpg123 decoder to v1.22.4 (2015-08-12), compiled with GCC 5.1.0<br /></li>
 <li>Updated ALAC decoder to refalac v1.47 (2015-02-15), based on reference implementation by Apple<br /></li>
+<li>Updated Monkey's Audio binary to v4.16 (2015-03-24), compiled with ICL 15.0 and MSVC 12.0<br /></li>
 <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>

diff --git a/doc/Changelog.md b/doc/Changelog.md
index 47dc3e4..783aa9d 100644 (file)
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -16,6 +16,7 @@
 * Updated MediaInfo to v0.7.76 (2015-08-06), compiled with ICL 15.0 and MSVC 12.0
 * Updated mpg123 decoder to v1.22.4 (2015-08-12), compiled with GCC 5.1.0
 * Updated ALAC decoder to refalac v1.47 (2015-02-15), based on reference implementation by Apple
+* Updated Monkey's Audio binary to v4.16 (2015-03-24), compiled with ICL 15.0 and MSVC 12.0
 * 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

diff --git a/etc/Patches/MAC-v4.16-Flush.V1.diff b/etc/Patches/MAC-v4.16-Flush.V1.diff
new file mode 100644 (file)
index 0000000..0b466b5
--- /dev/null
+++ b/etc/Patches/MAC-v4.16-Flush.V1.diff
@@ -0,0 +1,17 @@
+ Source/Console/Console.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Source/Console/Console.cpp b/Source/Console/Console.cpp
+index 145d4af..a4a8256 100644
+--- a/Source/Console/Console.cpp
++++ b/Source/Console/Console.cpp
+@@ -64,6 +64,9 @@ void CALLBACK ProgressCallback(int nPercentageDone)
+       // output the progress
+       _ftprintf(stderr, _T("Progress: %.1f%% (%.1f seconds remaining, %.1f seconds total)          \r"), 
+               dProgress * 100, dRemaining, dElapsed);
++
++      //Don't forget to flush!
++      fflush(stderr);
+ }
+ 
+ /***************************************************************************************

diff --git a/etc/Patches/MAC-v4.11-Flush.V1.diff b/etc/Patches/deprecated/MAC-v4.11-Flush.V1.diff
similarity index 100%
rename from etc/Patches/MAC-v4.11-Flush.V1.diff
rename to etc/Patches/deprecated/MAC-v4.11-Flush.V1.diff

diff --git a/res/Tools_Decd_A.qrc b/res/Tools_Decd_A.qrc
index d269b36..f1ea73b 100644 (file)
--- a/res/Tools_Decd_A.qrc
+++ b/res/Tools_Decd_A.qrc
@@ -3,7 +3,8 @@
   <qresource>
     <file>tools/avs2wav.exe</file>
     <file>tools/faad.exe</file>
-    <file>tools/mac.exe</file>
+    <file>tools/mac.i386.exe</file>
+    <file>tools/mac.sse2.exe</file>
     <file>tools/mpcdec.exe</file>
     <file>tools/mpg123.exe</file>
     <file>tools/oggdec.exe</file>

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

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

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

diff --git a/src/Config.h b/src/Config.h
index 6d5d28a..dbfdabc 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    2
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       5
-#define VER_LAMEXP_BUILD                                       1795
+#define VER_LAMEXP_BUILD                                       1796
 #define VER_LAMEXP_CONFG                                       1700
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Tools.h b/src/Tools.h
index 3b089a8..18fb829 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -70,7 +70,8 @@ g_lamexp_tools[] =
        {"c66992384b6388a7b68f2659624c150b33ff1cacb0c28c0ab2a3249eca4c31e204953f325403f78c077d1735b275ac12", CPU_TYPE_ALL_ALL, "keyring.gpg", UINT_MAX, ""},
        {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"},
        {"9511e7ef2ad10de05386eedf7f14d637edab894a53dacd2f8f15c6f8ed582f12c25fb5bf88438e62c46b8eb92e7634b2", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3995, "Final"},
-       {"fdbeb978025b9a5345300f37bb56446c31c7db594cf29407afdcc9ce20f4a5cec6eb8c03962c247d4f45b83c465ac705", CPU_TYPE_ALL_ALL, "mac.exe", 412, ""},
+       {"51af33a33bd9bde6ca6e9c612346b9c138584de59a92bc14a680729066fd849fd83fe668f79e2a06ffe117f39993d10a", CPU_TYPE_ALL_GEN, "mac.i386.exe", 416, ""},
+       {"117e60cf4445cec0a777d2636091a13c50be5c6ed28afaa75ab09ab4576942f1a8584b36d3abac9db7595dfb0d90207e", CPU_TYPE_ALL_SSE, "mac.sse2.exe", 416, ""},
        {"d251078bf5423641e0f4f98ce2e2fc9b916e40002988bcb20d1195618686d6a1aa29eb2278538ccc0ddc09e0caafe5c9", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 776, ""},
        {"3b83e24cc717c021d2222fb789bcb738e88bcefad0b937ea618cc81517f2d6357d8dce0e9b6c8d8a15d661d5e936a851", CPU_TYPE_X64_ALL, "mediainfo.x64.exe",  776, ""},
        {"7e6346a057634ff07b2e1f427035324f7f02100cc996425990f87f71d767fce4c7b101588c7d944ba49cb2d7e51c9bdb", CPU_TYPE_ALL_ALL, "mpcdec.exe", 475, ""},