Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(187) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-04-16 07:53:27
|
Author: manx Date: Tue Apr 16 09:53:13 2024 New Revision: 20608 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20608 Log: [Ref] mpt/io_read/filedata_base_unseekable_buffer.hpp: Add FileDataUnseekableBuffer which gives the stream reading implementation access to the complete backbuffer of already read data. This is useful for LZ-style compressors that require a backref window. Added: trunk/OpenMPT/src/mpt/io_read/filedata_base_unseekable_buffer.hpp (contents, props changed) Modified: trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win7/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win7/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/PluginBridge.vcxproj trunk/OpenMPT/build/vs2019win81/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2019win81/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win10/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win7/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win7/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/PluginBridge.vcxproj trunk/OpenMPT/build/vs2022win81/PluginBridge.vcxproj.filters trunk/OpenMPT/build/vs2022win81/PluginBridgeLegacy.vcxproj trunk/OpenMPT/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/autotools/Makefile.am Tue Apr 16 09:53:13 2024 (r20608) @@ -227,6 +227,7 @@ MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_base_buffered.hpp MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_base_seekable.hpp MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_base_unseekable.hpp +MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_base_unseekable_buffer.hpp MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_callbackstream.hpp MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_memory.hpp MPT_FILES_SRC_MPT += src/mpt/io_read/filedata_stdstream.hpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -798,6 +798,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -666,6 +666,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -850,6 +850,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridge.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -561,6 +561,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -856,6 +856,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/PluginBridgeLegacy.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -561,6 +561,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -877,6 +877,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -877,6 +877,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -907,6 +907,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -870,6 +870,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -781,6 +781,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -648,6 +648,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -798,6 +798,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -666,6 +666,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1103,6 +1103,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1260,6 +1260,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -850,6 +850,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridge.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -561,6 +561,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -856,6 +856,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/PluginBridgeLegacy.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -561,6 +561,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -877,6 +877,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -877,6 +877,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -907,6 +907,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -870,6 +870,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -781,6 +781,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -648,6 +648,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1878,6 +1878,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1302,6 +1302,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1429,6 +1429,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -708,6 +708,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1878,6 +1878,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1302,6 +1302,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1878,6 +1878,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -1302,6 +1302,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1555,6 +1555,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/PluginBridge.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -567,6 +567,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1555,6 +1555,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -567,6 +567,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1504,6 +1504,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Tue Apr 16 09:53:13 2024 (r20608) @@ -1504,6 +1504,7 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_buffered.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_seekable.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp" /> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_memory.hpp" /> <ClInclude Include="..\..\src\mpt\io_read\filedata_stdstream.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Mon Apr 15 21:17:06 2024 (r20607) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Tue Apr 16 09:53:13 2024 (r20608) @@ -864,6 +864,9 @@ <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\io_read\filedata_base_unseekable_buffer.hpp"> + <Filter>src\mpt\io_read</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\io_read\filedata_callbackstream.hpp"> <Filter>src\mpt\io_read</Filter> </ClInclude> Modified: trunk/OpenMPT/build/v... [truncated message content] |
|
From: <sv...@op...> - 2024-04-15 19:17:18
|
Author: sagamusix Date: Mon Apr 15 21:17:06 2024 New Revision: 20607 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20607 Log: [Mod] MOD: Report FEST/M&K! files as His Master's NoiseTracker instead of just NoiseTracker. Modified: trunk/OpenMPT/soundlib/Load_mod.cpp Modified: trunk/OpenMPT/soundlib/Load_mod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mod.cpp Mon Apr 15 15:44:02 2024 (r20606) +++ trunk/OpenMPT/soundlib/Load_mod.cpp Mon Apr 15 21:17:06 2024 (r20607) @@ -744,7 +744,7 @@ || IsMagic(magic, "FEST") // "His Master's Noise" musicdisk || IsMagic(magic, "N.T.")) { - result.madeWithTracker = UL_("NoiseTracker"); + result.madeWithTracker = IsMagic(magic, "N.T.") ? UL_("NoiseTracker") : UL_("His Master's NoiseTracker"); result.isNoiseTracker = true; result.setMODVBlankTiming = true; result.numChannels = 4; |
|
From: <sv...@op...> - 2024-04-15 13:44:16
|
Author: sagamusix Date: Mon Apr 15 15:44:02 2024 New Revision: 20606 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20606 Log: [Fix] PumaTracker waveform cycling was broken. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Mon Apr 15 15:43:23 2024 (r20605) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Mon Apr 15 15:44:02 2024 (r20606) @@ -43,7 +43,8 @@ bool m_gtkVibratoEnabled = false; uint8 m_gtkVibratoWidth = 0, m_gtkVibratoSpeed = 0, m_gtkVibratoPos = 0; - uint8 m_pumaStartWaveform = 0, m_pumaEndWaveform = 0, m_pumaWaveformStep = 0, m_pumaWaveform = 0; + uint8 m_pumaStartWaveform = 0, m_pumaEndWaveform = 0, m_pumaWaveform = 0; + int8 m_pumaWaveformStep = 0; uint8 m_medVibratoEnvelope = uint8_max, m_medVibratoSpeed = 0, m_medVibratoDepth = 0; uint16 m_medVibratoPos = 0; @@ -227,7 +228,7 @@ } // MED stuff - if(m_medArpOffset < events.size()) + if(m_medArpOffset < events.size() && events[m_medArpOffset].u16) { m_linearPitchFactor = 16 * events[m_medArpOffset + m_medArpPos].u8; m_medArpPos = static_cast<uint8>((m_medArpPos + 1) % events[m_medArpOffset].u16); @@ -407,7 +408,7 @@ m_pumaWaveformStep = 0; } else { - m_pumaWaveformStep = event.Byte1(); + m_pumaWaveformStep = static_cast<int8>(event.Byte1()); m_pumaEndWaveform = event.Byte2() + m_pumaStartWaveform; } ChannelSetSample(chn, sndFile, m_pumaWaveform); |
|
From: <sv...@op...> - 2024-04-15 13:43:38
|
Author: sagamusix Date: Mon Apr 15 15:43:23 2024 New Revision: 20605 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20605 Log: [Fix] Complete reset script state when resetting channel, don't just pause it. Modified: trunk/OpenMPT/soundlib/ModChannel.cpp Modified: trunk/OpenMPT/soundlib/ModChannel.cpp ============================================================================== --- trunk/OpenMPT/soundlib/ModChannel.cpp Sun Apr 14 21:06:43 2024 (r20604) +++ trunk/OpenMPT/soundlib/ModChannel.cpp Mon Apr 15 15:43:23 2024 (r20605) @@ -50,7 +50,7 @@ isPaused = false; portaTargetReached = false; rowCommand.Clear(); - synthState.Stop(); + mpt::reconstruct(synthState); } if(resetMask & resetSetPosAdvanced) |
|
From: <sv...@op...> - 2024-04-14 19:06:52
|
Author: sagamusix Date: Sun Apr 14 21:06:43 2024 New Revision: 20604 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20604 Log: [Imp] GMC: Addresses and offsets should probably be divisible by two as well. Modified: trunk/OpenMPT/soundlib/Load_gmc.cpp Modified: trunk/OpenMPT/soundlib/Load_gmc.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_gmc.cpp Sun Apr 14 18:35:25 2024 (r20603) +++ trunk/OpenMPT/soundlib/Load_gmc.cpp Sun Apr 14 21:06:43 2024 (r20604) @@ -40,7 +40,7 @@ bool IsValid() const { - if(offset > 0x7F'FFFF || address > 0x7F'FFFF) + if(offset > 0x7F'FFFF || (offset & 1) || address > 0x7F'FFFF || (address & 1)) return false; if(length > 0x7FFF || dataStart > 0x7FFF || (dataStart & 1)) return false; |
|
From: <sv...@op...> - 2024-04-14 16:35:34
|
Author: sagamusix Date: Sun Apr 14 18:35:25 2024 New Revision: 20603 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20603 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Sun Apr 14 18:35:19 2024 (r20602) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Sun Apr 14 18:35:25 2024 (r20603) @@ -11,6 +11,9 @@ `libopenmpt/bindings/freebasic/libopenmpt_ext.bi` were missing from the Autotools package. + * M15: Loosen SoundTracker file rejection heuristics a bit to allow loading of + schmokk.mod and scramble_2.mod. Other heuristics has been tightened a bit. + * mpg123: Update to v1.32.6 (2024-04-04). ### libopenmpt 0.5.29 (2024-03-24) |
|
From: <sv...@op...> - 2024-04-14 16:35:31
|
Author: sagamusix Date: Sun Apr 14 18:35:19 2024 New Revision: 20602 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20602 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Sun Apr 14 18:31:50 2024 (r20601) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Sun Apr 14 18:35:19 2024 (r20602) @@ -11,6 +11,9 @@ `libopenmpt/bindings/freebasic/libopenmpt_ext.bi` were missing from the Autotools package. + * M15: Loosen SoundTracker file rejection heuristics a bit to allow loading of + schmokk.mod and scramble_2.mod. Other heuristics has been tightened a bit. + * mpg123: Update to v1.32.6 (2024-04-04). ### libopenmpt 0.6.15 (2024-03-24) |
|
From: <sv...@op...> - 2024-04-14 16:32:03
|
Author: sagamusix Date: Sun Apr 14 18:31:50 2024 New Revision: 20601 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20601 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Sun Apr 14 18:13:32 2024 (r20600) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Sun Apr 14 18:31:50 2024 (r20601) @@ -11,6 +11,17 @@ `libopenmpt/bindings/freebasic/libopenmpt_ext.bi` were missing from the Autotools package. + * M15: Loosen SoundTracker file rejection heuristics a bit to allow loading of + schmokk.mod and scramble_2.mod. Other heuristics has been tightened a bit. + * MOD: Change VBlank timing heuristic to always assume CIA timing when long + samples unsupported by original ProTracker) are found. + * MOD: Disable NoiseTracker quirks if empty sample slots have a default volume + other than 0. + * MOD: 7-bit panning detection may have returned incorrect results for MODs + with a channel count other than 4. + * MED: Improve handling of default tempo, panning and channel volume in files + containing more than one song. + * mpg123: Update to v1.32.6 (2024-04-04). ### libopenmpt 0.7.6 (2024-03-24) |
Author: manx Date: Sun Apr 14 18:13:32 2024 New Revision: 20600 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20600 Log: Merged revision(s) 20477-20481 from trunk/OpenMPT: [Var] Opus: Update to v1.5.1 (2024-03-04) [Imp] Opus: Enable HARDENING. [Fix] Opus: Assume standard C99 headers for MSVC. [Imp] Opus: Enable optional AVX2 support on amd64 (not on x86 because of questionable gain due to way fewer registers being available). This penalizes system performance for earlier Intel AVX CPUs. See <https://gist.github.com/rygorous/32bc3ea8301dba09358fd2c64e02d774>. [Mod] Opus: Enable full DRED and NoLACE. This remains unused for now, but could be used with a future libopusfile for better decoding of corrupted Opus files. [Fix] Opus: Fix a plethora of build problems, in particular for optional AVX2 builds, pure SSE2 builds, and Clang builds. ........ [Fix] Opus: Fix typo. ........ [Ref] Opus: Silence warning. ........ [Var] Update .gitignore. ........ [Mod] build: Opus: Disable optional NoLACE/LACE/DEEP-PLC/DRED features of Opus 1.5. ........ Merged revision(s) 20580-20582 from trunk/OpenMPT: [Var] Opus: Update to v1.5.2 (2024-04-12) ........ [Var] Update gitignore. ........ [Var] Opus: Update to v1.5.2 (2024-04-12) ........ Added: branches/OpenMPT-1.31/include/opus/celt/x86/pitch_avx.c - copied unchanged from r20481, trunk/OpenMPT/include/opus/celt/x86/pitch_avx.c branches/OpenMPT-1.31/include/opus/celt/x86/x86_arch_macros.h - copied unchanged from r20481, trunk/OpenMPT/include/opus/celt/x86/x86_arch_macros.h branches/OpenMPT-1.31/include/opus/dnn/ (props changed) - copied from r20481, trunk/OpenMPT/include/opus/dnn/ branches/OpenMPT-1.31/include/opus/dnn/fargan_demo.c - copied unchanged from r20582, trunk/OpenMPT/include/opus/dnn/fargan_demo.c branches/OpenMPT-1.31/include/opus/silk/float/x86/ - copied from r20481, trunk/OpenMPT/include/opus/silk/float/x86/ branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_del_dec_avx2.c - copied, changed from r20481, trunk/OpenMPT/include/opus/silk/x86/NSQ_del_dec_avx2.c branches/OpenMPT-1.31/include/opus/src/extensions.c - copied unchanged from r20481, trunk/OpenMPT/include/opus/src/extensions.c Deleted: branches/OpenMPT-1.31/include/opus/dnn/lpcnet_demo.c branches/OpenMPT-1.31/include/opus/src/tansig_table.h branches/OpenMPT-1.31/include/opus/win32/ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.gitignore branches/OpenMPT-1.31/build/premake/ext-opus.lua branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win10/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win7/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win7/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2019win81/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2019win81/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win10clang/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win10clang/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win7/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win7/ext/opus.vcxproj.filters branches/OpenMPT-1.31/build/vs2022win81/ext/opus.vcxproj branches/OpenMPT-1.31/build/vs2022win81/ext/opus.vcxproj.filters branches/OpenMPT-1.31/include/opus/ (props changed) branches/OpenMPT-1.31/include/opus/COPYING branches/OpenMPT-1.31/include/opus/OpenMPT.txt branches/OpenMPT-1.31/include/opus/README branches/OpenMPT-1.31/include/opus/celt/arm/arm_celt_map.c branches/OpenMPT-1.31/include/opus/celt/arm/armcpu.c branches/OpenMPT-1.31/include/opus/celt/arm/armcpu.h branches/OpenMPT-1.31/include/opus/celt/arm/celt_neon_intr.c branches/OpenMPT-1.31/include/opus/celt/arm/pitch_neon_intr.c branches/OpenMPT-1.31/include/opus/celt/bands.c branches/OpenMPT-1.31/include/opus/celt/celt.h branches/OpenMPT-1.31/include/opus/celt/celt_decoder.c branches/OpenMPT-1.31/include/opus/celt/celt_encoder.c branches/OpenMPT-1.31/include/opus/celt/celt_lpc.c branches/OpenMPT-1.31/include/opus/celt/celt_lpc.h branches/OpenMPT-1.31/include/opus/celt/cpu_support.h branches/OpenMPT-1.31/include/opus/celt/entdec.c branches/OpenMPT-1.31/include/opus/celt/entdec.h branches/OpenMPT-1.31/include/opus/celt/entenc.c branches/OpenMPT-1.31/include/opus/celt/entenc.h branches/OpenMPT-1.31/include/opus/celt/laplace.c branches/OpenMPT-1.31/include/opus/celt/laplace.h branches/OpenMPT-1.31/include/opus/celt/mathops.h branches/OpenMPT-1.31/include/opus/celt/mips/celt_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/mips/mdct_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/mips/vq_mipsr1.h branches/OpenMPT-1.31/include/opus/celt/os_support.h branches/OpenMPT-1.31/include/opus/celt/pitch.c branches/OpenMPT-1.31/include/opus/celt/pitch.h branches/OpenMPT-1.31/include/opus/celt/stack_alloc.h branches/OpenMPT-1.31/include/opus/celt/x86/celt_lpc_sse4_1.c branches/OpenMPT-1.31/include/opus/celt/x86/pitch_sse.h branches/OpenMPT-1.31/include/opus/celt/x86/vq_sse.h branches/OpenMPT-1.31/include/opus/celt/x86/vq_sse2.c branches/OpenMPT-1.31/include/opus/celt/x86/x86_celt_map.c branches/OpenMPT-1.31/include/opus/celt/x86/x86cpu.c branches/OpenMPT-1.31/include/opus/celt/x86/x86cpu.h branches/OpenMPT-1.31/include/opus/dnn/dred_rdovae_dec_data.c branches/OpenMPT-1.31/include/opus/dnn/dred_rdovae_enc_data.c branches/OpenMPT-1.31/include/opus/dnn/dump_data.c branches/OpenMPT-1.31/include/opus/dnn/fargan_data.c branches/OpenMPT-1.31/include/opus/dnn/lace_data.c branches/OpenMPT-1.31/include/opus/dnn/lpcnet_private.h branches/OpenMPT-1.31/include/opus/dnn/nolace_data.c branches/OpenMPT-1.31/include/opus/dnn/pitchdnn_data.c branches/OpenMPT-1.31/include/opus/dnn/plc_data.c branches/OpenMPT-1.31/include/opus/dnn/vec_avx.h branches/OpenMPT-1.31/include/opus/dnn/vec_neon.h branches/OpenMPT-1.31/include/opus/include/opus.h branches/OpenMPT-1.31/include/opus/include/opus_defines.h branches/OpenMPT-1.31/include/opus/include/opus_multistream.h branches/OpenMPT-1.31/include/opus/package_version branches/OpenMPT-1.31/include/opus/silk/API.h branches/OpenMPT-1.31/include/opus/silk/NSQ.c branches/OpenMPT-1.31/include/opus/silk/NSQ_del_dec.c branches/OpenMPT-1.31/include/opus/silk/PLC.c branches/OpenMPT-1.31/include/opus/silk/PLC.h branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_del_dec_arm.h branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_del_dec_neon_intr.c branches/OpenMPT-1.31/include/opus/silk/arm/NSQ_neon.h branches/OpenMPT-1.31/include/opus/silk/arm/arm_silk_map.c branches/OpenMPT-1.31/include/opus/silk/control.h branches/OpenMPT-1.31/include/opus/silk/dec_API.c branches/OpenMPT-1.31/include/opus/silk/decode_frame.c branches/OpenMPT-1.31/include/opus/silk/enc_API.c branches/OpenMPT-1.31/include/opus/silk/fixed/encode_frame_FIX.c branches/OpenMPT-1.31/include/opus/silk/float/SigProc_FLP.h branches/OpenMPT-1.31/include/opus/silk/float/autocorrelation_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/burg_modified_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/corrMatrix_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/encode_frame_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_LPC_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_LTP_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_pitch_lags_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/find_pred_coefs_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/inner_product_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/main_FLP.h branches/OpenMPT-1.31/include/opus/silk/float/noise_shape_analysis_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/pitch_analysis_core_FLP.c branches/OpenMPT-1.31/include/opus/silk/float/warped_autocorrelation_FLP.c branches/OpenMPT-1.31/include/opus/silk/init_decoder.c branches/OpenMPT-1.31/include/opus/silk/init_encoder.c branches/OpenMPT-1.31/include/opus/silk/main.h branches/OpenMPT-1.31/include/opus/silk/mips/NSQ_del_dec_mipsr1.h branches/OpenMPT-1.31/include/opus/silk/mips/macros_mipsr1.h branches/OpenMPT-1.31/include/opus/silk/structs.h branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_del_dec_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/NSQ_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/VAD_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/VQ_WMat_EC_sse4_1.c branches/OpenMPT-1.31/include/opus/silk/x86/main_sse.h branches/OpenMPT-1.31/include/opus/silk/x86/x86_silk_map.c branches/OpenMPT-1.31/include/opus/src/analysis.c branches/OpenMPT-1.31/include/opus/src/mapping_matrix.c branches/OpenMPT-1.31/include/opus/src/mapping_matrix.h branches/OpenMPT-1.31/include/opus/src/mlp.c branches/OpenMPT-1.31/include/opus/src/mlp.h branches/OpenMPT-1.31/include/opus/src/mlp_data.c branches/OpenMPT-1.31/include/opus/src/opus.c branches/OpenMPT-1.31/include/opus/src/opus_decoder.c branches/OpenMPT-1.31/include/opus/src/opus_demo.c branches/OpenMPT-1.31/include/opus/src/opus_encoder.c branches/OpenMPT-1.31/include/opus/src/opus_multistream_decoder.c branches/OpenMPT-1.31/include/opus/src/opus_multistream_encoder.c branches/OpenMPT-1.31/include/opus/src/opus_private.h branches/OpenMPT-1.31/include/opus/src/opus_projection_encoder.c branches/OpenMPT-1.31/include/opus/src/repacketizer.c Modified: branches/OpenMPT-1.31/.gitignore ============================================================================== --- branches/OpenMPT-1.31/.gitignore Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/.gitignore Sun Apr 14 18:13:32 2024 (r20600) @@ -537,6 +537,8 @@ /include/opus/depcomp /include/opus/doc /include/opus/install-sh +/include/opus/lpcnet_headers.mk +/include/opus/lpcnet_sources.mk /include/opus/ltmain.sh /include/opus/m4 /include/opus/meson @@ -557,11 +559,12 @@ /include/opus/tests /include/opus/celt/meson.build /include/opus/celt/tests +/include/opus/dnn/README.md +/include/opus/dnn/meson.build /include/opus/include/meson.build /include/opus/silk/meson.build /include/opus/silk/tests /include/opus/src/meson.build -/include/opus/win32/VS2015 /include/opusenc/Makefile.am /include/opusenc/Makefile.in /include/opusenc/README.md Modified: branches/OpenMPT-1.31/build/premake/ext-opus.lua ============================================================================== --- branches/OpenMPT-1.31/build/premake/ext-opus.lua Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/premake/ext-opus.lua Sun Apr 14 18:13:32 2024 (r20600) @@ -8,7 +8,9 @@ includedirs { "../../include/opus/include", "../../include/opus/celt", + "../../include/opus/dnn", "../../include/opus/silk", + "../../include/opus/silk/fixed", "../../include/opus/silk/float", "../../include/opus/src", "../../include/opus/win32", @@ -37,23 +39,231 @@ files { "../../include/opus/celt/x86/*.c", "../../include/opus/celt/x86/*.h", + "../../include/opus/silk/float/x86/*.c", + "../../include/opus/silk/float/x86/*.h", "../../include/opus/silk/x86/*.c", "../../include/opus/silk/x86/*.h", } filter {} + filter { "architecture:arm or arm64" } + files { + "../../include/opus/celt/arm/*.c", + "../../include/opus/celt/arm/*.h", + "../../include/opus/silk/float/arm/*.c", + "../../include/opus/silk/float/arm/*.h", + "../../include/opus/silk/arm/*.c", + "../../include/opus/silk/arm/*.h", + } + filter {} excludes { "../../include/opus/celt/opus_custom_demo.c", "../../include/opus/src/opus_compare.c", "../../include/opus/src/opus_demo.c", "../../include/opus/src/repacketizer_demo.c", } - defines { "HAVE_CONFIG_H" } + filter {} + defines { + "OPUS_BUILD=1", + "PACKAGE_VERISON=\"1.5.2\"", + "ENABLE_HARDENING=1", + "HAVE_STDINT_H=1", + "HAVE_STDIO_H=1", + "HAVE_STDLIB_H=1", + "HAVE_STRING_H=1", + "USE_ALLOCA=1", + } + filter {} + if false then -- NoLACE (OSCE) / LACE (OSCE) / DEEP-PLC (DEEP_PLC || DRED) / DRED (DRED). + filter {} + files { + "../../include/opus/dnn/*.c", + "../../include/opus/dnn/*.h", + } + defines { + "ENABLE_DEEP_PLC=1", + "ENABLE_DRED=1", + "ENABLE_OSCE=1", + } + filter {} + filter { "architecture:x86 or x86_64" } + files { + "../../include/opus/dnn/x86/*.c", + "../../include/opus/dnn/x86/*.h", + } + filter {} + filter { "architecture:arm or arm64" } + files { + "../../include/opus/dnn/arm/*.c", + "../../include/opus/dnn/arm/*.h", + } + filter {} + excludes { + "../../include/opus/dnn/dump_data.c", + "../../include/opus/dnn/fargan_demo.c", + "../../include/opus/dnn/lossgen.c", + "../../include/opus/dnn/lossgen_data.c", + "../../include/opus/dnn/lossgen_demo.c", + "../../include/opus/dnn/write_lpcnet_weights.c", + } + filter {} + end + filter {} + if _OPTIONS["clang"] then + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + } + excludes { + "../../include/opus/dnn/x86/nnet_avx2.c", + "../../include/opus/dnn/x86/nnet_sse4_1.c", + } + filter {} + filter { "architecture:x86_64" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_PRESUME_SSE=1", + "OPUS_X86_PRESUME_SSE2=1", + } + excludes { + "../../include/opus/dnn/x86/nnet_avx2.c", + "../../include/opus/dnn/x86/nnet_sse4_1.c", + } + filter {} + filter { "architecture:arm" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + filter {} + filter { "architecture:arm64" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + filter {} + else + if _OPTIONS["windows-version"] == "winxp" then + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + } + filter {} + else + filter { "architecture:x86" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + } + filter {} + filter { "architecture:x86", "configurations:Checked" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:CheckedShared" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:Release" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:x86", "configurations:ReleaseShared" } + defines { + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + end + filter {} + filter { "architecture:x86_64" } + defines { + "OPUS_HAVE_RTCD=1", + "CPU_INFO_BY_C=1", + "OPUS_X86_MAY_HAVE_SSE=1", + "OPUS_X86_MAY_HAVE_SSE2=1", + "OPUS_X86_MAY_HAVE_SSE4_1=1", + "OPUS_X86_MAY_HAVE_AVX2=1", + "OPUS_X86_PRESUME_SSE", + "OPUS_X86_PRESUME_SSE2", + } + filter {} + filter { "architecture:arm" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + defines { + --"OPUS_HAVE_RTCD=1", + --"CPU_INFO_BY_C=1", + --"OPUS_ARM_MAY_HAVE_DOTPROD=1", + --"OPUS_ARM_MAY_HAVE_EDSP=1", + --"OPUS_ARM_MAY_HAVE_MEDIA=1", + --"OPUS_ARM_MAY_HAVE_NEON=1", + --"OPUS_ARM_MAY_HAVE_NEON_INTR=1", + } + filter {} + filter { "architecture:arm64" } + excludes { + "../../include/opus/celt/arm/celt_fft_ne10.c", + "../../include/opus/celt/arm/celt_mdct_ne10.c", + "../../include/opus/celt/arm/celt_neon_intr.c", + "../../include/opus/celt/arm/pitch_neon_intr.c", + "../../include/opus/dnn/arm/nnet_dotprod.c", + "../../include/opus/dnn/arm/nnet_neon.c", + } + defines { + --"OPUS_HAVE_RTCD=1", + --"CPU_INFO_BY_C=1", + --"OPUS_ARM_MAY_HAVE_DOTPROD=1", + --"OPUS_ARM_MAY_HAVE_EDSP=1", + --"OPUS_ARM_MAY_HAVE_MEDIA=1", + --"OPUS_ARM_MAY_HAVE_NEON=1", + --"OPUS_ARM_MAY_HAVE_NEON_INTR=1", + --"OPUS_ARM_PRESUME_NEON_INTR=1", + } + filter {} + end links { } filter { "action:vs*" } - buildoptions { "/wd4244", "/wd4334" } + buildoptions { + "/wd4244", + "/wd4305", + } filter {} filter { "action:vs*" } - buildoptions { "/wd6255", "/wd6297" } -- analyze + buildoptions { -- analyze + "/wd6255", + "/wd6297", + } filter {} filter { "kind:SharedLib" } defines { "DLL_EXPORT" } Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj Sun Apr 14 18:13:32 2024 (r20600) @@ -294,15 +294,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -314,14 +314,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -333,8 +333,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -344,7 +344,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -357,8 +357,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -367,7 +367,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -380,8 +380,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -392,7 +392,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -405,8 +405,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -416,7 +416,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -429,15 +429,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -450,14 +450,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -470,8 +470,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -481,7 +481,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -496,8 +496,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -506,7 +506,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -521,8 +521,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -533,7 +533,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -548,8 +548,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -559,7 +559,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -604,6 +604,7 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\celt_lpc_sse.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\pitch_sse.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\vq_sse.h" /> + <ClInclude Include="..\..\..\include\opus\celt\x86\x86_arch_macros.h" /> <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h" /> <ClInclude Include="..\..\..\include\opus\include\opus.h" /> <ClInclude Include="..\..\..\include\opus\include\opus_custom.h" /> @@ -641,7 +642,6 @@ <ClInclude Include="..\..\..\include\opus\src\mapping_matrix.h" /> <ClInclude Include="..\..\..\include\opus\src\mlp.h" /> <ClInclude Include="..\..\..\include\opus\src\opus_private.h" /> - <ClInclude Include="..\..\..\include\opus\src\tansig_table.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\include\opus\celt\bands.c" /> @@ -663,6 +663,7 @@ <ClCompile Include="..\..\..\include\opus\celt\rate.c" /> <ClCompile Include="..\..\..\include\opus\celt\vq.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\celt_lpc_sse4_1.c" /> + <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_avx.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse2.c" /> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse4_1.c" /> @@ -738,6 +739,7 @@ <ClCompile Include="..\..\..\include\opus\silk\float\sort_FLP.c" /> <ClCompile Include="..\..\..\include\opus\silk\float\warped_autocorrelation_FLP.c" /> <ClCompile Include="..\..\..\include\opus\silk\float\wrappers_FLP.c" /> + <ClCompile Include="..\..\..\include\opus\silk\float\x86\inner_product_FLP_avx2.c" /> <ClCompile Include="..\..\..\include\opus\silk\gain_quant.c" /> <ClCompile Include="..\..\..\include\opus\silk\init_decoder.c" /> <ClCompile Include="..\..\..\include\opus\silk\init_encoder.c" /> @@ -774,12 +776,14 @@ <ClCompile Include="..\..\..\include\opus\silk\tables_other.c" /> <ClCompile Include="..\..\..\include\opus\silk\tables_pitch_lag.c" /> <ClCompile Include="..\..\..\include\opus\silk\tables_pulses_per_block.c" /> + <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_avx2.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\VAD_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\VQ_WMat_EC_sse4_1.c" /> <ClCompile Include="..\..\..\include\opus\silk\x86\x86_silk_map.c" /> <ClCompile Include="..\..\..\include\opus\src\analysis.c" /> + <ClCompile Include="..\..\..\include\opus\src\extensions.c" /> <ClCompile Include="..\..\..\include\opus\src\mapping_matrix.c" /> <ClCompile Include="..\..\..\include\opus\src\mlp.c" /> <ClCompile Include="..\..\..\include\opus\src\mlp_data.c" /> Modified: branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxp/ext/opus.vcxproj.filters Sun Apr 14 18:13:32 2024 (r20600) @@ -16,6 +16,9 @@ <Filter Include="silk\float"> <UniqueIdentifier>{1DF5E91A-09AD-2B68-72B4-04C45E8BC658}</UniqueIdentifier> </Filter> + <Filter Include="silk\float\x86"> + <UniqueIdentifier>{520705BB-3ED5-F8C0-2769-69E713D6D425}</UniqueIdentifier> + </Filter> <Filter Include="silk\x86"> <UniqueIdentifier>{CD038233-B9D0-DC3E-E2E9-CAE6CE1512CD}</UniqueIdentifier> </Filter> @@ -123,6 +126,9 @@ <ClInclude Include="..\..\..\include\opus\celt\x86\vq_sse.h"> <Filter>celt\x86</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\opus\celt\x86\x86_arch_macros.h"> + <Filter>celt\x86</Filter> + </ClInclude> <ClInclude Include="..\..\..\include\opus\celt\x86\x86cpu.h"> <Filter>celt\x86</Filter> </ClInclude> @@ -234,9 +240,6 @@ <ClInclude Include="..\..\..\include\opus\src\opus_private.h"> <Filter>src</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\opus\src\tansig_table.h"> - <Filter>src</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\include\opus\celt\bands.c"> @@ -296,6 +299,9 @@ <ClCompile Include="..\..\..\include\opus\celt\x86\celt_lpc_sse4_1.c"> <Filter>celt\x86</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_avx.c"> + <Filter>celt\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\celt\x86\pitch_sse.c"> <Filter>celt\x86</Filter> </ClCompile> @@ -521,6 +527,9 @@ <ClCompile Include="..\..\..\include\opus\silk\float\wrappers_FLP.c"> <Filter>silk\float</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\silk\float\x86\inner_product_FLP_avx2.c"> + <Filter>silk\float\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\silk\gain_quant.c"> <Filter>silk</Filter> </ClCompile> @@ -629,6 +638,9 @@ <ClCompile Include="..\..\..\include\opus\silk\tables_pulses_per_block.c"> <Filter>silk</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_avx2.c"> + <Filter>silk\x86</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\silk\x86\NSQ_del_dec_sse4_1.c"> <Filter>silk\x86</Filter> </ClCompile> @@ -647,6 +659,9 @@ <ClCompile Include="..\..\..\include\opus\src\analysis.c"> <Filter>src</Filter> </ClCompile> + <ClCompile Include="..\..\..\include\opus\src\extensions.c"> + <Filter>src</Filter> + </ClCompile> <ClCompile Include="..\..\..\include\opus\src\mapping_matrix.c"> <Filter>src</Filter> </ClCompile> Modified: branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj ============================================================================== --- branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj Sun Apr 14 16:21:55 2024 (r20599) +++ branches/OpenMPT-1.31/build/vs2017winxpansi/ext/opus.vcxproj Sun Apr 14 18:13:32 2024 (r20600) @@ -294,15 +294,15 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -314,14 +314,14 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA=1;OPUS_HAVE_RTCD=1;CPU_INFO_BY_C=1;OPUS_X86_MAY_HAVE_SSE=1;OPUS_X86_MAY_HAVE_SSE2=1;OPUS_X86_MAY_HAVE_SSE4_1=1;OPUS_X86_MAY_HAVE_AVX2=1;OPUS_X86_PRESUME_SSE;OPUS_X86_PRESUME_SSE2;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\dnn;..\..\..\include\opus\silk;..\..\..\include\opus\silk\fixed;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <Optimization>Disabled</Optimization> <MinimalRebuild>false</MinimalRebuild> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4334 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:threadSafeInit- /wd4244 /wd4305 /wd6255 /wd6297 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -333,8 +333,8 @@ <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\include\opus\include;..\..\..\include\opus\celt;..\..\..\include\opus\silk;..\..\..\include\opus\silk\float;..\..\..\include\opus\src;..\..\..\include\opus\win32;..\..\..\include\opus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;OPUS_BUILD=1;PACKAGE_VERISON="1.5.2";ENABLE_HARDENING=1;HAVE_STDINT_H=1;HAVE_STDIO_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;USE_ALLOCA... [truncated message content] |
|
From: <sv...@op...> - 2024-04-14 14:22:02
|
Author: sagamusix Date: Sun Apr 14 16:21:55 2024 New Revision: 20599 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20599 Log: [Ref] PSM: Use new GetFirstValidIndex functionality. Modified: trunk/OpenMPT/soundlib/Load_psm.cpp Modified: trunk/OpenMPT/soundlib/Load_psm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_psm.cpp Sun Apr 14 16:16:32 2024 (r20598) +++ trunk/OpenMPT/soundlib/Load_psm.cpp Sun Apr 14 16:21:55 2024 (r20599) @@ -780,8 +780,7 @@ // Sample commands case 0x29: // 3-byte offset - we only support the middle byte. m.command = CMD_OFFSET; - m.param = rowChunk.ReadUint8(); - rowChunk.Skip(1); + m.param = rowChunk.ReadArray<uint8, 2>()[0]; break; case 0x2A: // retrigger m.command = CMD_RETRIG; @@ -855,20 +854,20 @@ { const PSMSubSong &subsong = subsongs[i]; ModSequence &order = Order(static_cast<SEQUENCEINDEX>(i)); - if(order.IsValidPat(0)) + const PATTERNINDEX startPattern = order.EnsureUnique(order.GetFirstValidIndex()); + if(startPattern == PATTERNINDEX_INVALID) + continue; + + // Subsongs with different panning setup -> write to pattern (MUSIC_C.PSM) + // Don't write channel volume for now, as there is no real-world module which needs it. + if(subsongPanningDiffers) { - PATTERNINDEX startPattern = order.EnsureUnique(0); - // Subsongs with different panning setup -> write to pattern (MUSIC_C.PSM) - // Don't write channel volume for now, as there is no real-world module which needs it. - if(subsongPanningDiffers) + for(CHANNELINDEX chn = 0; chn < m_nChannels; chn++) { - for(CHANNELINDEX chn = 0; chn < m_nChannels; chn++) - { - if(subsong.channelSurround[chn]) - Patterns[startPattern].WriteEffect(EffectWriter(CMD_S3MCMDEX, 0x91).Row(0).Channel(chn).RetryNextRow()); - else - Patterns[startPattern].WriteEffect(EffectWriter(CMD_PANNING8, subsong.channelPanning[chn]).Row(0).Channel(chn).RetryNextRow()); - } + if(subsong.channelSurround[chn]) + Patterns[startPattern].WriteEffect(EffectWriter(CMD_S3MCMDEX, 0x91).Row(0).Channel(chn).RetryNextRow()); + else + Patterns[startPattern].WriteEffect(EffectWriter(CMD_PANNING8, subsong.channelPanning[chn]).Row(0).Channel(chn).RetryNextRow()); } } } @@ -1225,7 +1224,7 @@ case 0x0E: // tone portamento m.command = CMD_TONEPORTAMENTO; break; - case 0x0F: // glissando control + case 0x0F: // glissando control (note: this can be found in the Odyssey music from Silverball but it seems like it was actually a literal translation from MOD effect F) m.command = CMD_S3MCMDEX; m.param |= 0x10; break; @@ -1267,8 +1266,7 @@ // Sample commands case 0x28: // 3-byte offset - we only support the middle byte. m.command = CMD_OFFSET; - m.param = patternChunk.ReadUint8(); - patternChunk.Skip(1); + m.param = patternChunk.ReadArray<uint8, 2>()[0]; break; case 0x29: // retrigger m.command = CMD_RETRIG; |
|
From: <sv...@op...> - 2024-04-14 14:16:38
|
Author: sagamusix Date: Sun Apr 14 16:16:32 2024 New Revision: 20598 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20598 Log: Merged revision(s) 20597 from trunk/OpenMPT: [Fix] MED: Possible crash when trying to access non-existing pattern (caught with afl++). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_med.cpp branches/OpenMPT-1.31/soundlib/ModSequence.cpp branches/OpenMPT-1.31/soundlib/ModSequence.h Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_med.cpp Sun Apr 14 16:15:51 2024 (r20597) +++ branches/OpenMPT-1.31/soundlib/Load_med.cpp Sun Apr 14 16:16:32 2024 (r20598) @@ -1447,7 +1447,7 @@ if(numSongs > 1) { - PATTERNINDEX firstPat = order.EnsureUnique(0); + PATTERNINDEX firstPat = order.EnsureUnique(order.GetFirstValidIndex()); if(firstPat != PATTERNINDEX_INVALID) { for(CHANNELINDEX chn = 0; chn < m_nChannels; chn++) Modified: branches/OpenMPT-1.31/soundlib/ModSequence.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/ModSequence.cpp Sun Apr 14 16:15:51 2024 (r20597) +++ branches/OpenMPT-1.31/soundlib/ModSequence.cpp Sun Apr 14 16:16:32 2024 (r20598) @@ -125,6 +125,18 @@ } +ORDERINDEX ModSequence::GetFirstValidIndex() const noexcept +{ + const ORDERINDEX length = GetLength(); + for(ORDERINDEX ord = 0; ord < length; ord++) + { + if(IsValidPat(ord)) + return ord; + } + return ORDERINDEX_INVALID; +} + + void ModSequence::Remove(ORDERINDEX posBegin, ORDERINDEX posEnd) noexcept { if(posEnd < posBegin || posEnd >= size()) Modified: branches/OpenMPT-1.31/soundlib/ModSequence.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/ModSequence.h Sun Apr 14 16:15:51 2024 (r20597) +++ branches/OpenMPT-1.31/soundlib/ModSequence.h Sun Apr 14 16:16:32 2024 (r20598) @@ -94,6 +94,9 @@ ORDERINDEX GetPreviousOrderIgnoringSkips(const ORDERINDEX start) const noexcept; ORDERINDEX GetNextOrderIgnoringSkips(const ORDERINDEX start) const noexcept; + // Returns the first item that contains a pattern that actually exists, ORDERINDEX_INVALID if no such item exists. + ORDERINDEX GetFirstValidIndex() const noexcept; + // Find an order item that contains a given pattern number. ORDERINDEX FindOrder(PATTERNINDEX pat, ORDERINDEX startSearchAt = 0, bool searchForward = true) const noexcept; |
|
From: <sv...@op...> - 2024-04-14 14:16:25
|
Author: sagamusix Revision: 20597 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -[Fix] MED: Possible crash when trying to access non-existing pattern. \ No newline at end of file +[Fix] MED: Possible crash when trying to access non-existing pattern (caught with afl++). \ No newline at end of file |
|
From: <sv...@op...> - 2024-04-14 14:16:06
|
Author: sagamusix Date: Sun Apr 14 16:15:51 2024 New Revision: 20597 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20597 Log: [Fix] MED: Possible crash when trying to access non-existing pattern. Modified: trunk/OpenMPT/soundlib/Load_med.cpp trunk/OpenMPT/soundlib/ModSequence.cpp trunk/OpenMPT/soundlib/ModSequence.h Modified: trunk/OpenMPT/soundlib/Load_med.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_med.cpp Sun Apr 14 14:58:52 2024 (r20596) +++ trunk/OpenMPT/soundlib/Load_med.cpp Sun Apr 14 16:15:51 2024 (r20597) @@ -1627,7 +1627,7 @@ if(numSongs > 1) { - PATTERNINDEX firstPat = order.EnsureUnique(0); + PATTERNINDEX firstPat = order.EnsureUnique(order.GetFirstValidIndex()); if(firstPat != PATTERNINDEX_INVALID) { for(CHANNELINDEX chn = 0; chn < m_nChannels; chn++) Modified: trunk/OpenMPT/soundlib/ModSequence.cpp ============================================================================== --- trunk/OpenMPT/soundlib/ModSequence.cpp Sun Apr 14 14:58:52 2024 (r20596) +++ trunk/OpenMPT/soundlib/ModSequence.cpp Sun Apr 14 16:15:51 2024 (r20597) @@ -149,6 +149,18 @@ } +ORDERINDEX ModSequence::GetFirstValidIndex() const noexcept +{ + const ORDERINDEX length = GetLength(); + for(ORDERINDEX ord = 0; ord < length; ord++) + { + if(IsValidPat(ord)) + return ord; + } + return ORDERINDEX_INVALID; +} + + void ModSequence::Remove(ORDERINDEX posBegin, ORDERINDEX posEnd) noexcept { if(posEnd < posBegin || posEnd >= size()) Modified: trunk/OpenMPT/soundlib/ModSequence.h ============================================================================== --- trunk/OpenMPT/soundlib/ModSequence.h Sun Apr 14 14:58:52 2024 (r20596) +++ trunk/OpenMPT/soundlib/ModSequence.h Sun Apr 14 16:15:51 2024 (r20597) @@ -98,6 +98,9 @@ ORDERINDEX GetPreviousOrderIgnoringSkips(const ORDERINDEX start) const noexcept; ORDERINDEX GetNextOrderIgnoringSkips(const ORDERINDEX start) const noexcept; + // Returns the first item that contains a pattern that actually exists, ORDERINDEX_INVALID if no such item exists. + ORDERINDEX GetFirstValidIndex() const noexcept; + // Find an order item that contains a given pattern number. ORDERINDEX FindOrder(PATTERNINDEX pat, ORDERINDEX startSearchAt = 0, bool searchForward = true) const noexcept; |
|
From: <sv...@op...> - 2024-04-14 12:59:04
|
Author: sagamusix Date: Sun Apr 14 14:58:52 2024 New Revision: 20596 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20596 Log: [Fix] MED: Synth arpeggios were accessing wrong member. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 13:22:14 2024 (r20595) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 14:58:52 2024 (r20596) @@ -438,7 +438,7 @@ return true; case Event::Type::MED_DefineArpeggio: - if(!event.Byte1()) + if(!event.u16) return false; m_nextRow = m_currentRow + event.u16; m_medArpOffset = m_currentRow; |
|
From: <sv...@op...> - 2024-04-14 11:22:21
|
Author: manx Date: Sun Apr 14 13:22:14 2024 New Revision: 20595 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20595 Log: [Ref] Instrument Synth: Use int8 storage for parameters that are interpreted as int8. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp trunk/OpenMPT/soundlib/InstrumentSynth.h trunk/OpenMPT/soundlib/Load_puma.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 12:37:12 2024 (r20594) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 13:22:14 2024 (r20595) @@ -422,13 +422,13 @@ m_nextRow = STOP_ROW; return true; case Event::Type::Puma_SetPitch: - m_linearPitchFactor = static_cast<int8>(event.Byte0()) * 8; + m_linearPitchFactor = event.i8 * 8; m_periodAdd = 0; m_ticksRemain = event.Byte2(); return true; case Event::Type::Puma_PitchRamp: m_linearPitchFactor = 0; - m_periodAdd = static_cast<int8>(event.Byte0()) * 4; + m_periodAdd = event.i8 * 4; m_ticksRemain = event.Byte2(); return true; Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 12:37:12 2024 (r20594) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 13:22:14 2024 (r20595) @@ -50,7 +50,7 @@ Puma_SetWaveform, // Parameter: Waveform (uint8), wavestorm step (uint8), number of waveforms to cycle (uint8) Puma_VolumeRamp, // Parameter: Start volume (uint8), end volume (uint8), number of ticks (uint8) Puma_StopVoice, // No parameter - Puma_SetPitch, // Parameter: Pitch offset (int8), number of ticks (uint8) + Puma_SetPitch, // Parameter: Pitch offset (int8), <unused> (uint8), number of ticks (uint8) Puma_PitchRamp, // Parameter: Start pitch offset (int8), end pitch offset (int8), number of ticks (uint8) Mupp_SetWaveform, // Parameter: Source instrument (uint8), waveform (uint8), volume (uint8) @@ -97,16 +97,16 @@ static constexpr Event GTK_SetPanningStep(int16 stepSize) noexcept { return Event{Type::GTK_SetPanningStep, stepSize}; } static constexpr Event GTK_SetSpeed(uint8 speed) noexcept { return Event{Type::GTK_SetSpeed, speed}; } static constexpr Event GTK_EnableTremor(uint8 enable) noexcept { return Event{Type::GTK_EnableTremor, enable}; } - static constexpr Event GTK_SetTremorTime(uint8 onTime, uint8 offTime) noexcept { return Event{Type::GTK_SetTremorTime, onTime, offTime, uint8(0)}; } + static constexpr Event GTK_SetTremorTime(uint8 onTime, uint8 offTime) noexcept { return Event{Type::GTK_SetTremorTime, onTime, offTime}; } static constexpr Event GTK_EnableTremolo(uint8 enable) noexcept { return Event{Type::GTK_EnableTremolo, enable}; } static constexpr Event GTK_EnableVibrato(uint8 enable) noexcept { return Event{Type::GTK_EnableVibrato, enable}; } - static constexpr Event GTK_SetVibratoParams(uint8 width, uint8 speed) noexcept { return Event{Type::GTK_SetVibratoParams, width, speed, uint8(0)}; } + static constexpr Event GTK_SetVibratoParams(uint8 width, uint8 speed) noexcept { return Event{Type::GTK_SetVibratoParams, width, speed}; } static constexpr Event Puma_SetWaveform(uint8 waveform, uint8 step, uint8 count) noexcept { return Event{Type::Puma_SetWaveform, waveform, step, count}; } static constexpr Event Puma_VolumeRamp(uint8 startVol, uint8 endVol, uint8 ticks) noexcept { return Event{Type::Puma_VolumeRamp, startVol, endVol, ticks}; } static constexpr Event Puma_StopVoice() noexcept { return Event{Type::Puma_StopVoice}; } - static constexpr Event Puma_SetPitch(uint8 pitchOffset, uint8 ticks) noexcept { return Event{Type::Puma_SetPitch, pitchOffset, uint8(0), ticks}; } - static constexpr Event Puma_PitchRamp(uint8 startPitch, uint8 endPitch, uint8 ticks) noexcept { return Event{Type::Puma_PitchRamp, startPitch, endPitch, ticks}; } + static constexpr Event Puma_SetPitch(int8 pitchOffset, uint8 ticks) noexcept { return Event{Type::Puma_SetPitch, pitchOffset, uint8(0), ticks}; } + static constexpr Event Puma_PitchRamp(int8 startPitch, int8 endPitch, uint8 ticks) noexcept { return Event{Type::Puma_PitchRamp, startPitch, endPitch, ticks}; } static constexpr Event Mupp_SetWaveform(uint8 instr, uint8 waveform, uint8 volume) noexcept { return Event{Type::Mupp_SetWaveform, instr, waveform, volume}; } @@ -149,7 +149,11 @@ protected: constexpr Event(Type type, uint8 b1, uint8 b2, uint8 b3) noexcept : type{type}, u8{b1}, bytes{b2, b3} {} - constexpr Event(Type type, uint16 u16, uint8 u8 = 0) noexcept : type{type}, u8{u8}, u16{u16} {} + constexpr Event(Type type, int8 b1, uint8 b2, uint8 b3) noexcept : type{type}, i8{b1}, bytes{b2, b3} {} + constexpr Event(Type type, int8 b1, int8 b2, uint8 b3) noexcept : type{type}, i8{b1}, bytes{static_cast<uint8>(b2), b3} {} + constexpr Event(Type type, uint8 b1, uint8 b2) noexcept : type{type}, u8{b1}, bytes{b2, 0} {} + constexpr Event(Type type, uint16 u16, uint8 u8) noexcept : type{type}, u8{u8}, u16{u16} {} + constexpr Event(Type type, uint16 u16) noexcept : type{type}, u8{0}, u16{u16} {} constexpr Event(Type type, int16 i16) noexcept : type{type}, u8{}, i16{i16} {} constexpr Event(Type type, uint8 u8) noexcept : type{type}, u8{u8}, u16{} {} constexpr Event(Type type, int8 i8) noexcept : type{type}, i8{i8}, u16{} {} Modified: trunk/OpenMPT/soundlib/Load_puma.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 12:37:12 2024 (r20594) +++ trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 13:22:14 2024 (r20595) @@ -105,7 +105,7 @@ if(isVolume) events.push_back(InstrumentSynth::Event::Puma_VolumeRamp(std::min(data[1], uint8(64)), std::min(data[2], uint8(64)), data[3])); else - events.push_back(InstrumentSynth::Event::Puma_PitchRamp(data[1], data[2], data[3])); + events.push_back(InstrumentSynth::Event::Puma_PitchRamp(static_cast<int8>(data[1]), static_cast<int8>(data[2]), data[3])); break; case 0xB0: // Jump if(data[1] & 3) @@ -124,7 +124,7 @@ // Odd values can be entered in the editor but playback will freeze if((data[1] & 1) || isVolume) return false; - events.push_back(InstrumentSynth::Event::Puma_SetPitch(data[1], data[3])); + events.push_back(InstrumentSynth::Event::Puma_SetPitch(static_cast<int8>(data[1]), data[3])); break; case 0xE0: // Stop sound / End of script if(isVolume) |
|
From: <sv...@op...> - 2024-04-14 10:37:19
|
Author: sagamusix Date: Sun Apr 14 12:37:12 2024 New Revision: 20594 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20594 Log: [Ref] InstrumentSynth: Small cleanup. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 11:55:16 2024 (r20593) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 12:37:12 2024 (r20594) @@ -33,31 +33,19 @@ int16 m_periodAdd = 0; uint16 m_gtkKeyOffOffset = STOP_ROW; - int16 m_gtkVolumeStep = 0; - int16 m_gtkPitchStep = 0; - int16 m_gtkPanningStep = 0; + int16 m_gtkVolumeStep = 0, m_gtkPitchStep = 0, m_gtkPanningStep = 0; uint16 m_gtkPitch = 4096; - uint8 m_gtkCount = 0; - uint8 m_gtkSpeed = 1; - uint8 m_gtkSpeedRemain = 1; + uint8 m_gtkLoopCount = 0; + uint8 m_gtkSpeed = 1, m_gtkSpeedRemain = 1; bool m_gtkTremorEnabled = false; - uint8 m_gtkTremorOnTime = 3; - uint8 m_gtkTremorOffTime = 3; - uint8 m_gtkTremorPos = 0; + uint8 m_gtkTremorOnTime = 3, m_gtkTremorOffTime = 3, m_gtkTremorPos = 0; bool m_gtkTremoloEnabled = false; bool m_gtkVibratoEnabled = false; - uint8 m_gtkVibratoWidth = 0; - uint8 m_gtkVibratoSpeed = 0; - uint8 m_gtkVibratoPos = 0; - - uint8 m_pumaStartWaveform = 0; - uint8 m_pumaEndWaveform = 0; - int8 m_pumaWaveformStep = 0; - uint8 m_pumaWaveform = 0; - - uint8 m_medVibratoEnvelope = uint8_max; - uint8 m_medVibratoSpeed = 0; - uint8 m_medVibratoDepth = 0; + uint8 m_gtkVibratoWidth = 0, m_gtkVibratoSpeed = 0, m_gtkVibratoPos = 0; + + uint8 m_pumaStartWaveform = 0, m_pumaEndWaveform = 0, m_pumaWaveformStep = 0, m_pumaWaveform = 0; + + uint8 m_medVibratoEnvelope = uint8_max, m_medVibratoSpeed = 0, m_medVibratoDepth = 0; uint16 m_medVibratoPos = 0; int16 m_medVolumeStep = 0; int16 m_medPeriodStep = 0; @@ -65,8 +53,7 @@ uint8 m_medArpPos = 0; uint8 m_medHold = uint8_max; uint16 m_medDecay = STOP_ROW; - uint8 m_medVolumeEnv = uint8_max; - uint8 m_medVolumeEnvPos = 0; + uint8 m_medVolumeEnv = uint8_max, m_medVolumeEnvPos = 0; void JumpToPosition(const Events &events, uint16 position); void NextTick(const Events &events, ModChannel &chn, int32 &period, const CSoundFile &sndFile); @@ -243,7 +230,7 @@ if(m_medArpOffset < events.size()) { m_linearPitchFactor = 16 * events[m_medArpOffset + m_medArpPos].u8; - m_medArpPos = static_cast<uint8>((m_medArpPos + 1) % static_cast<uint8>(events[m_medArpOffset].u16)); + m_medArpPos = static_cast<uint8>((m_medArpPos + 1) % events[m_medArpOffset].u16); } if(m_medVibratoDepth) { @@ -281,12 +268,12 @@ if(m_gtkTremoloEnabled) { m_volumeAdd = static_cast<int16>(ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 2); - m_gtkVibratoPos = (m_gtkVibratoPos + m_gtkVibratoSpeed) % (32u * 16u); + m_gtkVibratoPos += m_gtkVibratoSpeed; } if(m_gtkVibratoEnabled) { sndFile.DoFreqSlide(chn, period, -ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 96, false); - m_gtkVibratoPos = (m_gtkVibratoPos + m_gtkVibratoSpeed) % (32u * 16u); + m_gtkVibratoPos += m_gtkVibratoSpeed; } const bool periodsAreFrequencies = sndFile.PeriodsAreFrequencies(); @@ -345,12 +332,12 @@ return false; case Event::Type::GTK_SetLoopCounter: - m_gtkCount = event.u8; + m_gtkLoopCount = event.u8; return false; case Event::Type::GTK_EvaluateLoopCounter: - if(m_gtkCount) + if(m_gtkLoopCount) { - if(--m_gtkCount) + if(--m_gtkLoopCount) m_nextRow = event.u16; } return false; |
|
From: <sv...@op...> - 2024-04-14 09:55:45
|
Author: sagamusix Date: Sun Apr 14 11:55:16 2024 New Revision: 20593 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20593 Log: [Var] Update fuzzer dictionary. Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/all_formats.dict Sun Apr 14 08:41:45 2024 (r20592) +++ trunk/OpenMPT/contrib/fuzzing/all_formats.dict Sun Apr 14 11:55:16 2024 (r20593) @@ -146,9 +146,7 @@ # A couple of magic bytes are commented out because they do not modify the loader's behaviour, apart from setting a "made with" string. mod="M.K." #mod="M!K!" -mod="M&K!" mod="N.T." -#mod="FEST" #mod="NSMS" #mod="LARD" mod="OKTA" @@ -170,6 +168,10 @@ stam="ST1.3 ModuleINFO" stam="AudioSculpture10" +hmn="M&K!" +#hmn="FEST" +hmn="Mupp" + mptm="->MPT_ORIGINAL_IT<-" mptm=".tpm" mptm="mptm" @@ -348,3 +350,7 @@ iff="MHDR" iff="MDAT" iff="NAME" + +puma="patt" +puma="inst" +puma="insf" |
|
From: <sv...@op...> - 2024-04-14 06:41:57
|
Author: manx Date: Sun Apr 14 08:41:45 2024 New Revision: 20592 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20592 Log: [Ref] Silence GCC -Wconversion warnings. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp trunk/OpenMPT/soundlib/Load_puma.cpp Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 01:08:01 2024 (r20591) +++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp Sun Apr 14 08:41:45 2024 (r20592) @@ -243,7 +243,7 @@ if(m_medArpOffset < events.size()) { m_linearPitchFactor = 16 * events[m_medArpOffset + m_medArpPos].u8; - m_medArpPos = (m_medArpPos + 1) % static_cast<uint8>(events[m_medArpOffset].u16); + m_medArpPos = static_cast<uint8>((m_medArpPos + 1) % static_cast<uint8>(events[m_medArpOffset].u16)); } if(m_medVibratoDepth) { @@ -280,7 +280,7 @@ } if(m_gtkTremoloEnabled) { - m_volumeAdd = ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 2; + m_volumeAdd = static_cast<int16>(ModSinusTable[(m_gtkVibratoPos / 4u) % std::size(ModSinusTable)] * m_gtkVibratoWidth / 2); m_gtkVibratoPos = (m_gtkVibratoPos + m_gtkVibratoSpeed) % (32u * 16u); } if(m_gtkVibratoEnabled) @@ -427,7 +427,7 @@ return false; case Event::Type::Puma_VolumeRamp: m_ticksRemain = event.Byte2(); - m_volumeAdd = event.Byte0() * 256 - 16384; + m_volumeAdd = static_cast<int16>(event.Byte0() * 256 - 16384); return true; case Event::Type::Puma_StopVoice: chn.nRealVolume = 0; @@ -446,7 +446,7 @@ return true; case Event::Type::Mupp_SetWaveform: - ChannelSetSample(chn, sndFile, 32 + event.Byte0() * 28 + event.Byte1()); + ChannelSetSample(chn, sndFile, static_cast<SAMPLEINDEX>(32 + event.Byte0() * 28 + event.Byte1())); m_volumeFactor = static_cast<uint16>(std::min(event.Byte2() & 0x7F, 64) * 256u); return true; Modified: trunk/OpenMPT/soundlib/Load_puma.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 01:08:01 2024 (r20591) +++ trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 08:41:45 2024 (r20592) @@ -84,7 +84,7 @@ uint32 GetHeaderMinimumAdditionalSize() const { - return NumOrders() * sizeof(PumaPlaylistEntry) + numPatterns * 8 + 4 + numInstruments * 16 + 4; + return NumOrders() * static_cast<uint32>(sizeof(PumaPlaylistEntry)) + numPatterns * 8 + 4 + numInstruments * 16 + 4; } }; @@ -237,7 +237,7 @@ for(const auto &p : patternData[chnInfo.pattern]) { if(p[0]) - m->note = NOTE_MIDDLEC - 49 + (p[0] + chnInfo.noteTranspose) / 2; + m->note = static_cast<uint8>(NOTE_MIDDLEC - 49 + (p[0] + chnInfo.noteTranspose) / 2); if(uint8 instr = (p[1] & 0x1F); instr != 0) m->instr = (instr + chnInfo.instrTranspose) & 0x1F; if(!m->instr && m->note != NOTE_NONE) |
|
From: <sv...@op...> - 2024-04-13 23:08:14
|
Author: sagamusix Date: Sun Apr 14 01:08:01 2024 New Revision: 20591 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20591 Log: [Var] Remove stray semicolon. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 01:06:42 2024 (r20590) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 01:08:01 2024 (r20591) @@ -121,7 +121,7 @@ static constexpr Event MED_SetPeriodStep(int16 periodStep) noexcept { return Event{Type::MED_SetPeriodStep, periodStep}; } static constexpr Event MED_HoldDecay(uint8 hold, uint16 decay) noexcept { return Event{Type::MED_HoldDecay, decay, hold}; } - constexpr Event() noexcept : u8{}, u16{} {}; + constexpr Event() noexcept : u8{}, u16{} {} constexpr Event(const Event &other) noexcept = default; constexpr Event(Event &&other) noexcept = default; constexpr Event &operator=(const Event &other) noexcept = default; |
|
From: <sv...@op...> - 2024-04-13 23:06:49
|
Author: sagamusix Date: Sun Apr 14 01:06:42 2024 New Revision: 20590 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20590 Log: [Fix] One more try to make Clang happy... Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:58:55 2024 (r20589) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 01:06:42 2024 (r20590) @@ -121,7 +121,7 @@ static constexpr Event MED_SetPeriodStep(int16 periodStep) noexcept { return Event{Type::MED_SetPeriodStep, periodStep}; } static constexpr Event MED_HoldDecay(uint8 hold, uint16 decay) noexcept { return Event{Type::MED_HoldDecay, decay, hold}; } - constexpr Event() noexcept = default; + constexpr Event() noexcept : u8{}, u16{} {}; constexpr Event(const Event &other) noexcept = default; constexpr Event(Event &&other) noexcept = default; constexpr Event &operator=(const Event &other) noexcept = default; |
|
From: <sv...@op...> - 2024-04-13 22:59:01
|
Author: sagamusix Date: Sun Apr 14 00:58:55 2024 New Revision: 20589 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20589 Log: [Fix] Autotools: Add missing include file. Modified: trunk/OpenMPT/build/autotools/Makefile.am Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Sun Apr 14 00:43:44 2024 (r20588) +++ trunk/OpenMPT/build/autotools/Makefile.am Sun Apr 14 00:58:55 2024 (r20589) @@ -367,6 +367,7 @@ MPT_FILES_SOUNDLIB += soundlib/FloatMixer.h MPT_FILES_SOUNDLIB += soundlib/InstrumentExtensions.cpp MPT_FILES_SOUNDLIB += soundlib/InstrumentSynth.cpp +MPT_FILES_SOUNDLIB += soundlib/InstrumentSynth.h MPT_FILES_SOUNDLIB += soundlib/IntMixer.h MPT_FILES_SOUNDLIB += soundlib/ITCompression.cpp MPT_FILES_SOUNDLIB += soundlib/ITCompression.h |
|
From: <sv...@op...> - 2024-04-13 22:43:51
|
Author: sagamusix Date: Sun Apr 14 00:43:44 2024 New Revision: 20588 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20588 Log: [Fix] Hopefully silence more constexpr errors. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:29:44 2024 (r20587) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:43:44 2024 (r20588) @@ -150,9 +150,9 @@ protected: constexpr Event(Type type, uint8 b1, uint8 b2, uint8 b3) noexcept : type{type}, u8{b1}, bytes{b2, b3} {} constexpr Event(Type type, uint16 u16, uint8 u8 = 0) noexcept : type{type}, u8{u8}, u16{u16} {} - constexpr Event(Type type, int16 i16) noexcept : type{type}, i16{i16} {} - constexpr Event(Type type, uint8 u8) noexcept : type{type}, u8{u8} {} - constexpr Event(Type type, int8 i8) noexcept : type{type}, i8{i8} {} + constexpr Event(Type type, int16 i16) noexcept : type{type}, u8{}, i16{i16} {} + constexpr Event(Type type, uint8 u8) noexcept : type{type}, u8{u8}, u16{} {} + constexpr Event(Type type, int8 i8) noexcept : type{type}, i8{i8}, u16{} {} explicit constexpr Event(Type type) noexcept : type{type}, u8{}, u16{} {} }; |
|
From: <sv...@op...> - 2024-04-13 22:29:56
|
Author: sagamusix Date: Sun Apr 14 00:29:44 2024 New Revision: 20587 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20587 Log: [Fix] Mark function as static. Modified: trunk/OpenMPT/soundlib/Load_puma.cpp Modified: trunk/OpenMPT/soundlib/Load_puma.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 00:24:00 2024 (r20586) +++ trunk/OpenMPT/soundlib/Load_puma.cpp Sun Apr 14 00:29:44 2024 (r20587) @@ -91,7 +91,7 @@ MPT_BINARY_STRUCT(PumaFileHeader, 80) -bool TranslatePumaScript(InstrumentSynth::Events &events, ModInstrument &instr, FileReader &file, bool isVolume) +static bool TranslatePumaScript(InstrumentSynth::Events &events, ModInstrument &instr, FileReader &file, bool isVolume) { bool isFirst = true; while(file.CanRead(4)) |
|
From: <sv...@op...> - 2024-04-13 22:24:12
|
Author: sagamusix Date: Sun Apr 14 00:24:00 2024 New Revision: 20586 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20586 Log: [Fix] Hopefully silence GCC error regarding constexpr Event constructor. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:20:13 2024 (r20585) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:24:00 2024 (r20586) @@ -75,9 +75,9 @@ }; union { - uint16 u16 = 0; + uint16 u16; int16 i16; - std::array<uint8, 2> bytes; + std::array<uint8, 2> bytes = {{}}; }; static constexpr Event StopScript() noexcept { return Event{Type::StopScript}; } |
|
From: <sv...@op...> - 2024-04-13 22:20:20
|
Author: sagamusix Date: Sun Apr 14 00:20:13 2024 New Revision: 20585 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20585 Log: [Fix] Silence warning regarding initialization order. Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h Modified: trunk/OpenMPT/soundlib/InstrumentSynth.h ============================================================================== --- trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:14:50 2024 (r20584) +++ trunk/OpenMPT/soundlib/InstrumentSynth.h Sun Apr 14 00:20:13 2024 (r20585) @@ -149,7 +149,7 @@ protected: constexpr Event(Type type, uint8 b1, uint8 b2, uint8 b3) noexcept : type{type}, u8{b1}, bytes{b2, b3} {} - constexpr Event(Type type, uint16 u16, uint8 u8 = 0) noexcept : type{type}, u16{u16}, u8{u8} {} + constexpr Event(Type type, uint16 u16, uint8 u8 = 0) noexcept : type{type}, u8{u8}, u16{u16} {} constexpr Event(Type type, int16 i16) noexcept : type{type}, i16{i16} {} constexpr Event(Type type, uint8 u8) noexcept : type{type}, u8{u8} {} constexpr Event(Type type, int8 i8) noexcept : type{type}, i8{i8} {} |
3 messages has been excluded from this view by a project administrator.
