diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index 11cef2c9..b1c6443c 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -405,6 +405,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i + @@ -1272,6 +1273,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + Designer + diff --git a/LameXP_VS2010.vcxproj.filters b/LameXP_VS2010.vcxproj.filters index 83259fb8..eba31ba5 100644 --- a/LameXP_VS2010.vcxproj.filters +++ b/LameXP_VS2010.vcxproj.filters @@ -424,6 +424,9 @@ Source Files\Misc + + Generated Files\QRC + @@ -779,6 +782,9 @@ Header Files\Models + + Resources + diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj index a78e1623..5030a267 100644 --- a/LameXP_VS2013.vcxproj +++ b/LameXP_VS2013.vcxproj @@ -407,6 +407,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i + @@ -1274,6 +1275,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + Designer + diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters index 83259fb8..eba31ba5 100644 --- a/LameXP_VS2013.vcxproj.filters +++ b/LameXP_VS2013.vcxproj.filters @@ -424,6 +424,9 @@ Source Files\Misc + + Generated Files\QRC + @@ -779,6 +782,9 @@ Header Files\Models + + Resources + diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj index 78f564c6..e369b47a 100644 --- a/LameXP_VS2015.vcxproj +++ b/LameXP_VS2015.vcxproj @@ -407,6 +407,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i + @@ -1274,6 +1275,19 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + Designer + diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters index 83259fb8..eba31ba5 100644 --- a/LameXP_VS2015.vcxproj.filters +++ b/LameXP_VS2015.vcxproj.filters @@ -424,6 +424,9 @@ Source Files\Misc + + Generated Files\QRC + @@ -779,6 +782,9 @@ Header Files\Models + + Resources + diff --git a/doc/Changelog.html b/doc/Changelog.html index 7d250d95..bd47146e 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -87,6 +87,7 @@
  • Fixed the location of temporary intermediate files for SoX-based audio effects
  • Enabled the "built-in" resampler for QAAC encoder
  • The "Algorithm Quality" slider now also effects the QAAC encoder
  • +
  • Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12)
  • Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
  • Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
  • Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
  • diff --git a/doc/Changelog.md b/doc/Changelog.md index b565193e..ed8a5867 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -7,6 +7,7 @@ * Fixed the location of temporary intermediate files for SoX-based audio effects * Enabled the "built-in" resampler for QAAC encoder * The "Algorithm Quality" slider now also effects the QAAC encoder +* Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12) * Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0 * Updated QAAC add-in to the to QAAC v2.58 (2016-01-05) * Updated FhgAacEnc add-in to "Case" edition (2015-10-24) diff --git a/res/Tools_Decd_A.qrc b/res/Tools_Decd_A.qrc index 5bc0e703..748c0307 100644 --- a/res/Tools_Decd_A.qrc +++ b/res/Tools_Decd_A.qrc @@ -10,7 +10,6 @@ tools/oggdec.exe tools/opusdec.i386.exe tools/opusdec.sse2.exe - tools/refalac.i386.exe - tools/refalac.x64.exe + tools/opusdec.avx.exe diff --git a/res/Tools_Encd_C.qrc b/res/Tools_Encd_C.qrc index d3a206d4..673c8fe1 100644 --- a/res/Tools_Encd_C.qrc +++ b/res/Tools_Encd_C.qrc @@ -3,5 +3,6 @@ tools/opusenc.i386.exe tools/opusenc.sse2.exe + tools/opusenc.avx.exe diff --git a/res/tools/opusdec.avx.exe b/res/tools/opusdec.avx.exe new file mode 100644 index 00000000..0b2f02b5 Binary files /dev/null and b/res/tools/opusdec.avx.exe differ diff --git a/res/tools/opusdec.i386.exe b/res/tools/opusdec.i386.exe index 748f0876..97cb9b0f 100644 Binary files a/res/tools/opusdec.i386.exe and b/res/tools/opusdec.i386.exe differ diff --git a/res/tools/opusdec.sse2.exe b/res/tools/opusdec.sse2.exe index f31caddd..4180af21 100644 Binary files a/res/tools/opusdec.sse2.exe and b/res/tools/opusdec.sse2.exe differ diff --git a/res/tools/opusenc.avx.exe b/res/tools/opusenc.avx.exe new file mode 100644 index 00000000..a073018b Binary files /dev/null and b/res/tools/opusenc.avx.exe differ diff --git a/res/tools/opusenc.i386.exe b/res/tools/opusenc.i386.exe index 5bccd003..2ca45e46 100644 Binary files a/res/tools/opusenc.i386.exe and b/res/tools/opusenc.i386.exe differ diff --git a/res/tools/opusenc.sse2.exe b/res/tools/opusenc.sse2.exe index bc2330d6..03b68877 100644 Binary files a/res/tools/opusenc.sse2.exe and b/res/tools/opusenc.sse2.exe differ diff --git a/src/Config.h b/src/Config.h index eac58720..5bd86871 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 1866 +#define VER_LAMEXP_PATCH 5 +#define VER_LAMEXP_BUILD 1870 #define VER_LAMEXP_CONFG 1818 ///////////////////////////////////////////////////////////////////////////////