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
(184) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-05-08 06:14:09
|
Author: manx Date: Wed May 8 08:13:58 2024 New Revision: 20730 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20730 Log: Merged revision(s) 20726 from trunk/OpenMPT: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/MixerInterface.h Modified: branches/OpenMPT-1.30/soundlib/MixerInterface.h ============================================================================== --- branches/OpenMPT-1.30/soundlib/MixerInterface.h Wed May 8 08:13:29 2024 (r20729) +++ branches/OpenMPT-1.30/soundlib/MixerInterface.h Wed May 8 08:13:58 2024 (r20730) @@ -66,7 +66,7 @@ // FilterFunc: Functor for applying the resonant filter // MixFunc: Functor for mixing the computed sample data into the output buffer template<class Traits, class InterpolationFunc, class FilterFunc, class MixFunc> -static void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) +inline void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) { ModChannel &c = chn; const typename Traits::input_t * MPT_RESTRICT inSample = static_cast<const typename Traits::input_t *>(c.pCurrentSample); |
|
From: <sv...@op...> - 2024-05-08 06:13:41
|
Author: manx Date: Wed May 8 08:13:29 2024 New Revision: 20729 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20729 Log: Merged revision(s) 20726 from trunk/OpenMPT: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/MixerInterface.h Modified: branches/OpenMPT-1.31/soundlib/MixerInterface.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/MixerInterface.h Wed May 8 08:13:04 2024 (r20728) +++ branches/OpenMPT-1.31/soundlib/MixerInterface.h Wed May 8 08:13:29 2024 (r20729) @@ -79,7 +79,7 @@ // FilterFunc: Functor for applying the resonant filter // MixFunc: Functor for mixing the computed sample data into the output buffer template<class Traits, class InterpolationFunc, class FilterFunc, class MixFunc> -static void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) +inline void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) { ModChannel &c = chn; const typename Traits::input_t * MPT_RESTRICT inSample = static_cast<const typename Traits::input_t *>(c.pCurrentSample); |
|
From: <sv...@op...> - 2024-05-08 06:13:16
|
Author: manx Date: Wed May 8 08:13:04 2024 New Revision: 20728 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20728 Log: Merged revision(s) 20725 from trunk/OpenMPT: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/misc/WriteMemoryDump.h Modified: branches/OpenMPT-1.31/misc/WriteMemoryDump.h ============================================================================== --- branches/OpenMPT-1.31/misc/WriteMemoryDump.h Wed May 8 08:12:38 2024 (r20727) +++ branches/OpenMPT-1.31/misc/WriteMemoryDump.h Wed May 8 08:13:04 2024 (r20728) @@ -23,7 +23,7 @@ OPENMPT_NAMESPACE_BEGIN -static bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) +inline bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) { using MINIDUMPWRITEDUMP = BOOL(WINAPI *)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam); |
|
From: <sv...@op...> - 2024-05-08 06:12:52
|
Author: manx Date: Wed May 8 08:12:38 2024 New Revision: 20727 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20727 Log: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. Modified: trunk/OpenMPT/soundlib/MODTools.h Modified: trunk/OpenMPT/soundlib/MODTools.h ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.h Wed May 8 08:11:05 2024 (r20726) +++ trunk/OpenMPT/soundlib/MODTools.h Wed May 8 08:12:38 2024 (r20727) @@ -79,7 +79,7 @@ using MODPatternData = std::array<std::array<std::array<uint8, 4>, 4>, 64>; // Check if header magic equals a given string. -static inline bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept +inline bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept { return std::memcmp(magic1, magic2, 4) == 0; } @@ -87,7 +87,7 @@ // For .DTM files from Apocalypse Abyss, where the first 2108 bytes are swapped template<typename T, typename TFileReader> -static T ReadAndSwap(TFileReader &file, const bool swapBytes) +inline T ReadAndSwap(TFileReader &file, const bool swapBytes) { T value; if(file.Read(value) && swapBytes) @@ -117,7 +117,7 @@ // Check if number of malformed bytes in MOD pattern data exceeds some threshold template <typename TFileReader> -static bool ValidateMODPatternData(TFileReader &file, const uint32 threshold, const bool extendedFormat) +inline bool ValidateMODPatternData(TFileReader &file, const uint32 threshold, const bool extendedFormat) { MODPatternData patternData; if(!file.Read(patternData)) |
|
From: <sv...@op...> - 2024-05-08 06:11:12
|
Author: manx Date: Wed May 8 08:11:05 2024 New Revision: 20726 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20726 Log: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. Modified: trunk/OpenMPT/soundlib/MixerInterface.h Modified: trunk/OpenMPT/soundlib/MixerInterface.h ============================================================================== --- trunk/OpenMPT/soundlib/MixerInterface.h Wed May 8 08:10:54 2024 (r20725) +++ trunk/OpenMPT/soundlib/MixerInterface.h Wed May 8 08:11:05 2024 (r20726) @@ -79,7 +79,7 @@ // FilterFunc: Functor for applying the resonant filter // MixFunc: Functor for mixing the computed sample data into the output buffer template<class Traits, class InterpolationFunc, class FilterFunc, class MixFunc> -static void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) +inline void SampleLoop(ModChannel &chn, const CResampler &resampler, typename Traits::output_t * MPT_RESTRICT outBuffer, unsigned int numSamples) { ModChannel &c = chn; const typename Traits::input_t * MPT_RESTRICT inSample = static_cast<const typename Traits::input_t *>(c.pCurrentSample); |
|
From: <sv...@op...> - 2024-05-08 06:11:07
|
Author: manx Date: Wed May 8 08:10:54 2024 New Revision: 20725 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20725 Log: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. Modified: trunk/OpenMPT/misc/WriteMemoryDump.h Modified: trunk/OpenMPT/misc/WriteMemoryDump.h ============================================================================== --- trunk/OpenMPT/misc/WriteMemoryDump.h Wed May 8 08:10:42 2024 (r20724) +++ trunk/OpenMPT/misc/WriteMemoryDump.h Wed May 8 08:10:54 2024 (r20725) @@ -23,7 +23,7 @@ OPENMPT_NAMESPACE_BEGIN -static bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) +inline bool WriteMemoryDump(_EXCEPTION_POINTERS *pExceptionInfo, const TCHAR *filename, bool fullMemDump) { using MINIDUMPWRITEDUMP = BOOL(WINAPI *)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam); |
|
From: <sv...@op...> - 2024-05-08 06:10:55
|
Author: manx Date: Wed May 8 08:10:42 2024 New Revision: 20724 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20724 Log: [Fix] Static (internal linkage) functions in namespace scope in headers can cause ODR-violations when used by external linkage inline functions. Modified: trunk/OpenMPT/common/GzipWriter.h Modified: trunk/OpenMPT/common/GzipWriter.h ============================================================================== --- trunk/OpenMPT/common/GzipWriter.h Tue May 7 23:59:00 2024 (r20723) +++ trunk/OpenMPT/common/GzipWriter.h Wed May 8 08:10:42 2024 (r20724) @@ -22,7 +22,7 @@ OPENMPT_NAMESPACE_BEGIN -static void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName) +inline void WriteGzip(std::ostream &output, std::string &outData, const mpt::ustring &fileName) { z_stream strm{}; strm.avail_in = static_cast<uInt>(outData.size()); |
Author: sagamusix Date: Tue May 7 23:59:00 2024 New Revision: 20723 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20723 Log: [New] Can now read Images Music System (IMS) files - yet another NoiseTracker variant... [Mod] OpenMPT: Version is now 1.32.00.12 Added: trunk/OpenMPT/soundlib/Load_ims.cpp (contents, props changed) Modified: trunk/OpenMPT/build/android_ndk/Android.mk 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-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/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/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.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/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/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.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/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/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-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/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/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.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/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/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.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/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/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.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/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/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-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/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/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.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/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/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch.iss trunk/OpenMPT/soundlib/Load_stk.cpp trunk/OpenMPT/soundlib/MODTools.cpp trunk/OpenMPT/soundlib/MODTools.h trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h trunk/OpenMPT/soundlib/Tables.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/android_ndk/Android.mk Tue May 7 23:59:00 2024 (r20723) @@ -130,6 +130,7 @@ soundlib/Load_gt2.cpp \ soundlib/Load_ice.cpp \ soundlib/Load_imf.cpp \ + soundlib/Load_ims.cpp \ soundlib/Load_it.cpp \ soundlib/Load_itp.cpp \ soundlib/load_j2b.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/autotools/Makefile.am Tue May 7 23:59:00 2024 (r20723) @@ -395,6 +395,7 @@ MPT_FILES_SOUNDLIB += soundlib/Load_gt2.cpp MPT_FILES_SOUNDLIB += soundlib/Load_ice.cpp MPT_FILES_SOUNDLIB += soundlib/Load_imf.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_ims.cpp MPT_FILES_SOUNDLIB += soundlib/Load_it.cpp MPT_FILES_SOUNDLIB += soundlib/Load_itp.cpp MPT_FILES_SOUNDLIB += soundlib/load_j2b.cpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -994,6 +994,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -994,6 +994,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1033,6 +1033,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1247,6 +1247,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1367,6 +1367,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2048,6 +2048,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -994,6 +994,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -994,6 +994,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1033,6 +1033,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1247,6 +1247,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2142,6 +2142,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2142,6 +2142,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2142,6 +2142,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1621,6 +1621,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1621,6 +1621,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1690,6 +1690,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1253,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1651,6 +1651,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1651,6 +1651,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -991,6 +991,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -991,6 +991,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1030,6 +1030,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1253,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1386,6 +1386,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -991,6 +991,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -991,6 +991,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1211,6 +1211,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1030,6 +1030,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1253,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2182,6 +2182,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2182,6 +2182,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -2182,6 +2182,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -2090,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ims.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_it.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Tue May 7 23:59:00 2024 (r20723) @@ -1661,6 +1661,7 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ims.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Tue May 7 23:36:16 2024 (r20722) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Tue May 7 23:59:00 2024 (r20723) @@ -1... [truncated message content] |
|
From: <sv...@op...> - 2024-05-07 21:36:28
|
Author: sagamusix Date: Tue May 7 23:36:16 2024 New Revision: 20722 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20722 Log: [Mod/Reg] MOD: Don't pretend that StarTrekker format variants other than 4 and 8 channels exist. Only accept FLT4/FLT8/EXO4/EXO8 magic bytes. Modified: trunk/OpenMPT/soundlib/Load_mod.cpp Modified: trunk/OpenMPT/soundlib/Load_mod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mod.cpp Tue May 7 23:23:30 2024 (r20721) +++ trunk/OpenMPT/soundlib/Load_mod.cpp Tue May 7 23:36:16 2024 (r20722) @@ -200,7 +200,7 @@ result.numChannels = static_cast<CHANNELINDEX>(magic[3] - '0'); // Digital Tracker MODs contain four bytes (00 40 00 00) right after the magic bytes which don't seem to do anything special. result.patternDataOffset = 1088; - } else if((!memcmp(magic, "FLT", 3) || !memcmp(magic, "EXO", 3)) && magic[3] >= '4' && magic[3] <= '9') + } else if((!memcmp(magic, "FLT", 3) || !memcmp(magic, "EXO", 3)) && (magic[3] == '4' || magic[3] == '8')) { // FLTx / EXOx - Startrekker by Exolon / Fairlight result.madeWithTracker = UL_("Startrekker"); |
|
From: <sv...@op...> - 2024-05-07 21:23:43
|
Author: sagamusix Date: Tue May 7 23:23:30 2024 New Revision: 20721 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20721 Log: [Fix] Mark header functions as inline / move to implementation file. Modified: trunk/OpenMPT/soundlib/MODTools.cpp trunk/OpenMPT/soundlib/MODTools.h Modified: trunk/OpenMPT/soundlib/MODTools.cpp ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.cpp Tue May 7 23:15:15 2024 (r20720) +++ trunk/OpenMPT/soundlib/MODTools.cpp Tue May 7 23:23:30 2024 (r20721) @@ -296,6 +296,23 @@ } +uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn) +{ + sampleHeader.ConvertToMPT(sample, is4Chn); + sampleName = mpt::String::ReadBuf(mpt::String::spacePadded, sampleHeader.name); + // Get rid of weird characters in sample names. + for(auto &c : sampleName.buf) + { + if(c > 0 && c < ' ') + { + c = ' '; + } + } + // Check for invalid values + return sampleHeader.GetInvalidByteScore(); +} + + // Count malformed bytes in MOD pattern data uint32 CountMalformedMODPatternData(const MODPatternData &patternData, const bool extendedFormat) { Modified: trunk/OpenMPT/soundlib/MODTools.h ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.h Tue May 7 23:15:15 2024 (r20720) +++ trunk/OpenMPT/soundlib/MODTools.h Tue May 7 23:23:30 2024 (r20721) @@ -79,7 +79,7 @@ using MODPatternData = std::array<std::array<std::array<uint8, 4>, 4>, 64>; // Check if header magic equals a given string. -static bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept +static inline bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept { return std::memcmp(magic1, magic2, 4) == 0; } @@ -103,21 +103,8 @@ } -static uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn) -{ - sampleHeader.ConvertToMPT(sample, is4Chn); - sampleName = mpt::String::ReadBuf(mpt::String::spacePadded, sampleHeader.name); - // Get rid of weird characters in sample names. - for(auto &c : sampleName.buf) - { - if(c > 0 && c < ' ') - { - c = ' '; - } - } - // Check for invalid values - return sampleHeader.GetInvalidByteScore(); -} +// Convert MOD sample header and validate +uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn); // Count malformed bytes in MOD pattern data |
Author: sagamusix Date: Tue May 7 23:15:15 2024 New Revision: 20720 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20720 Log: [Ref] Reduce the 2.7kLOC monolith that is Load_mod.cpp into one slightly smaller 1.3kLOC file, only handling NoiseTracker/ProTracker/Startrekker and several other smaller files for related formats. [Ref] Rename M15 loader to STK. This is a much more common and "official" extension for SoundTracker modules. Added: trunk/OpenMPT/soundlib/Load_ice.cpp - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Load_kris.cpp - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Load_pt36.cpp - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Load_stk.cpp - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/MODTools.cpp - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/MODTools.h - copied, changed from r20719, trunk/OpenMPT/soundlib/Load_mod.cpp Modified: trunk/OpenMPT/build/android_ndk/Android.mk 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-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/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/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.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/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/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.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/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/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-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/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/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.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/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/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.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/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/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.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/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/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-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/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/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.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/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/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h Modified: trunk/OpenMPT/build/android_ndk/Android.mk ============================================================================== --- trunk/OpenMPT/build/android_ndk/Android.mk Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/android_ndk/Android.mk Tue May 7 23:15:15 2024 (r20720) @@ -128,10 +128,12 @@ soundlib/Load_gdm.cpp \ soundlib/Load_gmc.cpp \ soundlib/Load_gt2.cpp \ + soundlib/Load_ice.cpp \ soundlib/Load_imf.cpp \ soundlib/Load_it.cpp \ soundlib/Load_itp.cpp \ soundlib/load_j2b.cpp \ + soundlib/Load_kris.cpp \ soundlib/Load_mdl.cpp \ soundlib/Load_med.cpp \ soundlib/Load_mid.cpp \ @@ -143,10 +145,12 @@ soundlib/Load_okt.cpp \ soundlib/Load_plm.cpp \ soundlib/Load_psm.cpp \ + soundlib/Load_pt36.cpp \ soundlib/Load_ptm.cpp \ soundlib/Load_puma.cpp \ soundlib/Load_s3m.cpp \ soundlib/Load_sfx.cpp \ + soundlib/Load_stk.cpp \ soundlib/Load_stm.cpp \ soundlib/Load_stp.cpp \ soundlib/Load_symmod.cpp \ @@ -168,6 +172,7 @@ soundlib/ModSequence.cpp \ soundlib/modsmp_ctrl.cpp \ soundlib/mod_specifications.cpp \ + soundlib/MODTools.cpp \ soundlib/MPEGFrame.cpp \ soundlib/OggStream.cpp \ soundlib/OPL.cpp \ Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/autotools/Makefile.am Tue May 7 23:15:15 2024 (r20720) @@ -393,10 +393,12 @@ MPT_FILES_SOUNDLIB += soundlib/Load_gdm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_gmc.cpp MPT_FILES_SOUNDLIB += soundlib/Load_gt2.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_ice.cpp MPT_FILES_SOUNDLIB += soundlib/Load_imf.cpp MPT_FILES_SOUNDLIB += soundlib/Load_it.cpp MPT_FILES_SOUNDLIB += soundlib/Load_itp.cpp MPT_FILES_SOUNDLIB += soundlib/load_j2b.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_kris.cpp MPT_FILES_SOUNDLIB += soundlib/Load_mdl.cpp MPT_FILES_SOUNDLIB += soundlib/Load_med.cpp MPT_FILES_SOUNDLIB += soundlib/Load_mid.cpp @@ -408,10 +410,12 @@ MPT_FILES_SOUNDLIB += soundlib/Load_okt.cpp MPT_FILES_SOUNDLIB += soundlib/Load_plm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_psm.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_pt36.cpp MPT_FILES_SOUNDLIB += soundlib/Load_ptm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_puma.cpp MPT_FILES_SOUNDLIB += soundlib/Load_s3m.cpp MPT_FILES_SOUNDLIB += soundlib/Load_sfx.cpp +MPT_FILES_SOUNDLIB += soundlib/Load_stk.cpp MPT_FILES_SOUNDLIB += soundlib/Load_stm.cpp MPT_FILES_SOUNDLIB += soundlib/Load_stp.cpp MPT_FILES_SOUNDLIB += soundlib/Load_symmod.cpp @@ -449,6 +453,8 @@ MPT_FILES_SOUNDLIB += soundlib/modsmp_ctrl.h MPT_FILES_SOUNDLIB += soundlib/mod_specifications.cpp MPT_FILES_SOUNDLIB += soundlib/mod_specifications.h +MPT_FILES_SOUNDLIB += soundlib/MODTools.cpp +MPT_FILES_SOUNDLIB += soundlib/MODTools.h MPT_FILES_SOUNDLIB += soundlib/MPEGFrame.cpp MPT_FILES_SOUNDLIB += soundlib/MPEGFrame.h MPT_FILES_SOUNDLIB += soundlib/OggStream.cpp Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -703,6 +703,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -991,9 +992,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1005,10 +1008,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1019,6 +1024,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -342,6 +342,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1202,6 +1205,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1211,6 +1217,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1244,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1256,6 +1268,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1286,6 +1301,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -703,6 +703,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -991,9 +992,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1005,10 +1008,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1019,6 +1024,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -342,6 +342,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1202,6 +1205,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1211,6 +1217,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1244,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1256,6 +1268,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1286,6 +1301,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -733,6 +733,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1030,9 +1031,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1044,10 +1047,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1058,6 +1063,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -351,6 +351,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1238,6 +1241,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1247,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1280,6 +1289,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1292,6 +1304,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1322,6 +1337,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -923,6 +923,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -1364,9 +1365,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1378,10 +1381,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1392,6 +1397,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -720,6 +720,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -2039,6 +2042,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2048,6 +2054,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2081,6 +2090,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2093,6 +2105,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -2123,6 +2138,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp"> <Filter>soundlib</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Tue May 7 23:15:15 2024 (r20720) @@ -703,6 +703,7 @@ <ClInclude Include="..\..\soundlib\Loaders.h" /> <ClInclude Include="..\..\soundlib\MIDIEvents.h" /> <ClInclude Include="..\..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\..\soundlib\MODTools.h" /> <ClInclude Include="..\..\soundlib\MPEGFrame.h" /> <ClInclude Include="..\..\soundlib\Message.h" /> <ClInclude Include="..\..\soundlib\MixFuncTable.h" /> @@ -991,9 +992,11 @@ <ClCompile Include="..\..\soundlib\Load_gdm.cpp" /> <ClCompile Include="..\..\soundlib\Load_gmc.cpp" /> <ClCompile Include="..\..\soundlib\Load_gt2.cpp" /> + <ClCompile Include="..\..\soundlib\Load_ice.cpp" /> <ClCompile Include="..\..\soundlib\Load_imf.cpp" /> <ClCompile Include="..\..\soundlib\Load_it.cpp" /> <ClCompile Include="..\..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\..\soundlib\Load_kris.cpp" /> <ClCompile Include="..\..\soundlib\Load_mdl.cpp" /> <ClCompile Include="..\..\soundlib\Load_med.cpp" /> <ClCompile Include="..\..\soundlib\Load_mid.cpp" /> @@ -1005,10 +1008,12 @@ <ClCompile Include="..\..\soundlib\Load_okt.cpp" /> <ClCompile Include="..\..\soundlib\Load_plm.cpp" /> <ClCompile Include="..\..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp" /> <ClCompile Include="..\..\soundlib\Load_ptm.cpp" /> <ClCompile Include="..\..\soundlib\Load_puma.cpp" /> <ClCompile Include="..\..\soundlib\Load_s3m.cpp" /> <ClCompile Include="..\..\soundlib\Load_sfx.cpp" /> + <ClCompile Include="..\..\soundlib\Load_stk.cpp" /> <ClCompile Include="..\..\soundlib\Load_stm.cpp" /> <ClCompile Include="..\..\soundlib\Load_stp.cpp" /> <ClCompile Include="..\..\soundlib\Load_symmod.cpp" /> @@ -1019,6 +1024,7 @@ <ClCompile Include="..\..\soundlib\Load_xmf.cpp" /> <ClCompile Include="..\..\soundlib\MIDIEvents.cpp" /> <ClCompile Include="..\..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\..\soundlib\MODTools.cpp" /> <ClCompile Include="..\..\soundlib\MPEGFrame.cpp" /> <ClCompile Include="..\..\soundlib\Message.cpp" /> <ClCompile Include="..\..\soundlib\MixFuncTable.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Mon May 6 23:33:13 2024 (r20719) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Tue May 7 23:15:15 2024 (r20720) @@ -342,6 +342,9 @@ <ClInclude Include="..\..\soundlib\MIDIMacros.h"> <Filter>soundlib</Filter> </ClInclude> + <ClInclude Include="..\..\soundlib\MODTools.h"> + <Filter>soundlib</Filter> + </ClInclude> <ClInclude Include="..\..\soundlib\MPEGFrame.h"> <Filter>soundlib</Filter> </ClInclude> @@ -1202,6 +1205,9 @@ <ClCompile Include="..\..\soundlib\Load_gt2.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_ice.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_imf.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1211,6 +1217,9 @@ <ClCompile Include="..\..\soundlib\Load_itp.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_kris.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_mdl.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1244,6 +1253,9 @@ <ClCompile Include="..\..\soundlib\Load_psm.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_pt36.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_ptm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1256,6 +1268,9 @@ <ClCompile Include="..\..\soundlib\Load_sfx.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\Load_stk.cpp"> + <Filter>soundlib</Filter> + </ClCompile> <ClCompile Include="..\..\soundlib\Load_stm.cpp"> <Filter>soundlib</Filter> </ClCompile> @@ -1286,6 +1301,9 @@ <ClCompile Include="..\..\soundlib\MIDIMacros.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\soundlib\MODTools.cpp"> + <Filter>soundlib</Filter> + </ClComp... [truncated message content] |
|
From: <sv...@op...> - 2024-05-06 21:33:25
|
Author: sagamusix Date: Mon May 6 23:33:13 2024 New Revision: 20719 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20719 Log: [Imp] Mod conversion: Attempt to convert HMN mega-arp command at least partially. Modified: trunk/OpenMPT/soundlib/Sndmix.cpp trunk/OpenMPT/soundlib/Tables.cpp trunk/OpenMPT/soundlib/Tables.h trunk/OpenMPT/soundlib/modcommand.cpp Modified: trunk/OpenMPT/soundlib/Sndmix.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndmix.cpp Mon May 6 23:23:53 2024 (r20718) +++ trunk/OpenMPT/soundlib/Sndmix.cpp Mon May 6 23:33:13 2024 (r20719) @@ -1627,27 +1627,8 @@ } } else if(chn.rowCommand.command == CMD_HMN_MEGA_ARP) { - static constexpr std::array<uint8, 16> MegaArp[] = - { - {0, 3, 7, 12, 15, 12, 7, 3, 0, 3, 7, 12, 15, 12, 7, 3 }, - {0, 4, 7, 12, 16, 12, 7, 4, 0, 4, 7, 12, 16, 12, 7, 4 }, - {0, 3, 8, 12, 15, 12, 8, 3, 0, 3, 8, 12, 15, 12, 8, 3 }, - {0, 4, 8, 12, 16, 12, 8, 4, 0, 4, 8, 12, 16, 12, 8, 4 }, - {0, 5, 8, 12, 17, 12, 8, 5, 0, 5, 8, 12, 17, 12, 8, 5 }, - {0, 5, 9, 12, 17, 12, 9, 5, 0, 5, 9, 12, 17, 12, 9, 5 }, - {12, 0, 7, 0, 3, 0, 7, 0, 12, 0, 7, 0, 3, 0, 7, 0 }, - {12, 0, 7, 0, 4, 0, 7, 0, 12, 0, 7, 0, 4, 0, 7, 0 }, - {0, 3, 7, 3, 7, 12, 7, 12, 15, 12, 7, 12, 7, 3, 7, 3 }, - {0, 4, 7, 4, 7, 12, 7, 12, 16, 12, 7, 12, 7, 4, 7, 4 }, - {31, 27, 24, 19, 15, 12, 7, 3, 0, 3, 7, 12, 15, 19, 24, 27}, - {31, 28, 24, 19, 16, 12, 7, 4, 0, 4, 7, 12, 16, 19, 24, 28}, - {0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12}, - {0, 12, 24, 12, 0, 12, 24, 12, 0, 12, 24, 12, 0, 12, 24, 12}, - {0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3 }, - {0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4 } - }; uint8 note = static_cast<uint8>(GetNoteFromPeriod(period, chn.nFineTune, chn.nC5Speed)); - note += MegaArp[chn.rowCommand.param & 0x0F][chn.nArpeggio & 0x0F]; + note += HisMastersNoiseMegaArp[chn.rowCommand.param & 0x0F][chn.nArpeggio & 0x0F]; chn.nArpeggio++; period = GetPeriodFromNote(note, chn.nFineTune, chn.nC5Speed); } Modified: trunk/OpenMPT/soundlib/Tables.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Tables.cpp Mon May 6 23:23:53 2024 (r20718) +++ trunk/OpenMPT/soundlib/Tables.cpp Mon May 6 23:33:13 2024 (r20719) @@ -692,6 +692,28 @@ }; +// Note LUT for His Master's Noise command 7 (Mega-Arp) +const std::array<uint8, 16> HisMastersNoiseMegaArp[16] = +{ + {0, 3, 7, 12, 15, 12, 7, 3, 0, 3, 7, 12, 15, 12, 7, 3 }, + {0, 4, 7, 12, 16, 12, 7, 4, 0, 4, 7, 12, 16, 12, 7, 4 }, + {0, 3, 8, 12, 15, 12, 8, 3, 0, 3, 8, 12, 15, 12, 8, 3 }, + {0, 4, 8, 12, 16, 12, 8, 4, 0, 4, 8, 12, 16, 12, 8, 4 }, + {0, 5, 8, 12, 17, 12, 8, 5, 0, 5, 8, 12, 17, 12, 8, 5 }, + {0, 5, 9, 12, 17, 12, 9, 5, 0, 5, 9, 12, 17, 12, 9, 5 }, + {12, 0, 7, 0, 3, 0, 7, 0, 12, 0, 7, 0, 3, 0, 7, 0 }, + {12, 0, 7, 0, 4, 0, 7, 0, 12, 0, 7, 0, 4, 0, 7, 0 }, + {0, 3, 7, 3, 7, 12, 7, 12, 15, 12, 7, 12, 7, 3, 7, 3 }, + {0, 4, 7, 4, 7, 12, 7, 12, 16, 12, 7, 12, 7, 4, 7, 4 }, + {31, 27, 24, 19, 15, 12, 7, 3, 0, 3, 7, 12, 15, 19, 24, 27}, + {31, 28, 24, 19, 16, 12, 7, 4, 0, 4, 7, 12, 16, 19, 24, 28}, + {0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12, 0, 12}, + {0, 12, 24, 12, 0, 12, 24, 12, 0, 12, 24, 12, 0, 12, 24, 12}, + {0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3 }, + {0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4 } +}; + + ///////////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/OpenMPT/soundlib/Tables.h ============================================================================== --- trunk/OpenMPT/soundlib/Tables.h Mon May 6 23:23:53 2024 (r20718) +++ trunk/OpenMPT/soundlib/Tables.h Mon May 6 23:33:13 2024 (r20719) @@ -39,6 +39,7 @@ extern const uint32 LinearSlideUpTable[256]; extern const uint32 LinearSlideDownTable[256]; extern const uint16 XMPanningTable[256]; +extern const std::array<uint8, 16> HisMastersNoiseMegaArp[16]; extern const uint8 AutoVibratoIT2XM[8]; extern const uint8 AutoVibratoXM2IT[8]; Modified: trunk/OpenMPT/soundlib/modcommand.cpp ============================================================================== --- trunk/OpenMPT/soundlib/modcommand.cpp Mon May 6 23:23:53 2024 (r20718) +++ trunk/OpenMPT/soundlib/modcommand.cpp Mon May 6 23:33:13 2024 (r20719) @@ -917,6 +917,10 @@ if((command == CMD_REVERSEOFFSET || command == CMD_OFFSETPERCENTAGE) && !newSpecs.HasCommand(command)) { command = CMD_OFFSET; + } else if(command == CMD_HMN_MEGA_ARP && !newSpecs.HasCommand(CMD_HMN_MEGA_ARP)) + { + command = CMD_ARPEGGIO; + param = (HisMastersNoiseMegaArp[param & 0x0F][1] << 4) | HisMastersNoiseMegaArp[param & 0x0F][2]; } if(!newSpecs.HasNote(note)) |
|
From: <sv...@op...> - 2024-05-06 21:24:01
|
Author: sagamusix Date: Mon May 6 23:23:53 2024 New Revision: 20718 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20718 Log: [Ref] Various small changes which should not change any functionality (whitespace fixes, comments fixes, header include reordering...) Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp trunk/OpenMPT/mptrack/ColorSchemes.h trunk/OpenMPT/mptrack/KeyConfigDlg.cpp trunk/OpenMPT/mptrack/UpdateCheck.cpp trunk/OpenMPT/sounddsp/AGC.cpp trunk/OpenMPT/soundlib/Load_ams.cpp trunk/OpenMPT/soundlib/Load_plm.cpp trunk/OpenMPT/soundlib/Load_sfx.cpp trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Mon May 6 23:23:53 2024 (r20718) @@ -279,7 +279,7 @@ pLVCD->clrTextBk = isDefault ? defColor : modColor; } break; - } + } } Modified: trunk/OpenMPT/mptrack/ColorSchemes.h ============================================================================== --- trunk/OpenMPT/mptrack/ColorSchemes.h Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/ColorSchemes.h Mon May 6 23:23:53 2024 (r20718) @@ -18,7 +18,7 @@ struct ColorScheme { const TCHAR *name; - struct { ModColor id : 8; COLORREF color : 24; } colors[MAX_MODCOLORS]; + struct { const ModColor id : 8; const COLORREF color : 24; } colors[MAX_MODCOLORS]; }; inline constexpr ColorScheme ColorSchemes[] = Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Mon May 6 23:23:53 2024 (r20718) @@ -625,7 +625,7 @@ selectedItem = m_lbnCommandKeys.GetSelectionMark(); } - const CommandID cmd = static_cast<CommandID>(m_lbnCommandKeys.GetItemData(selectedItem)); + const CommandID cmd = (selectedItem >= 0) ? static_cast<CommandID>(m_lbnCommandKeys.GetItemData(selectedItem)) : kcNull; CString str; //Separator Modified: trunk/OpenMPT/mptrack/UpdateCheck.cpp ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon May 6 23:23:53 2024 (r20718) @@ -924,7 +924,7 @@ -static const char * const updateScript = R"vbs( +static const char updateScript[] = R"vbs( Wscript.Echo Wscript.Echo "OpenMPT portable Update" Modified: trunk/OpenMPT/sounddsp/AGC.cpp ============================================================================== --- trunk/OpenMPT/sounddsp/AGC.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/sounddsp/AGC.cpp Mon May 6 23:23:53 2024 (r20718) @@ -85,7 +85,7 @@ CAGC::CAGC() { - Initialize(true, 44100); + Initialize(true, 48000); } Modified: trunk/OpenMPT/soundlib/Load_ams.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ams.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_ams.cpp Mon May 6 23:23:53 2024 (r20718) @@ -773,10 +773,10 @@ { return true; } - + InitializeGlobals(MOD_TYPE_AMS); - - m_songName = songName; + + m_songName = std::move(songName); m_nInstruments = fileHeader.numIns; m_nChannels = 32; Modified: trunk/OpenMPT/soundlib/Load_plm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_plm.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_plm.cpp Mon May 6 23:23:53 2024 (r20718) @@ -275,7 +275,8 @@ const uint32 patternEnd = ord.x + patHeader.numRows; maxPos = std::max(maxPos, patternEnd); - ModCommand::NOTE lastNote[32] = { 0 }; + std::array<ModCommand::NOTE, 32> lastNote; + lastNote.fill(NOTE_NONE); for(ROWINDEX r = 0; r < patHeader.numRows; r++, curRow++) { if(curRow >= rowsPerPat) Modified: trunk/OpenMPT/soundlib/Load_sfx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_sfx.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/Load_sfx.cpp Mon May 6 23:23:53 2024 (r20718) @@ -60,7 +60,7 @@ uint16be loopStart; uint16be loopLength; - // Convert an MOD sample header to OpenMPT's internal sample header. + // Convert an SFX sample header to OpenMPT's internal sample header. void ConvertToMPT(ModSample &mptSmp, uint32 length) const { mptSmp.Initialize(MOD_TYPE_MOD); Modified: trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/SymMODEcho.cpp Mon May 6 23:23:53 2024 (r20718) @@ -209,15 +209,15 @@ switch(static_cast<Parameters>(param)) { case kEchoType: - switch(GetDSPType()) - { - case DSPType::Off: return _T("Off"); - case DSPType::Normal: return _T("Normal"); - case DSPType::Cross: return _T("Cross"); - case DSPType::Cross2: return _T("Cross 2"); - case DSPType::Center: return _T("Center"); - case DSPType::NumTypes: break; - } + switch(GetDSPType()) + { + case DSPType::Off: return _T("Off"); + case DSPType::Normal: return _T("Normal"); + case DSPType::Cross: return _T("Cross"); + case DSPType::Cross2: return _T("Cross 2"); + case DSPType::Center: return _T("Center"); + case DSPType::NumTypes: break; + } break; case kEchoDelay: return mpt::cfmt::val(m_chunk.param[kEchoDelay]); Modified: trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/DMOPlugin.cpp Mon May 6 23:23:53 2024 (r20718) @@ -14,9 +14,9 @@ #include "mpt/base/aligned_array.hpp" #if defined(MPT_WITH_DMO) +#include "DMOPlugin.h" #include "mpt/uuid/guid.hpp" #include "../../Sndfile.h" -#include "DMOPlugin.h" #include "../PluginManager.h" #include <uuids.h> #include <medparam.h> Modified: trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Distortion.cpp Mon May 6 23:23:53 2024 (r20718) @@ -13,8 +13,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Distortion.h" +#include "../../Sndfile.h" #include "DMOUtils.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS Modified: trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Echo.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Echo.h" +#include "../../Sndfile.h" #endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/Gargle.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,9 +11,9 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Gargle.h" -#endif // !NO_PLUGINS +#include "../../Sndfile.h" +#endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/I3DL2Reverb.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "I3DL2Reverb.h" +#include "../../Sndfile.h" #ifdef MODPLUG_TRACKER #include "../../../sounddsp/Reverb.h" #endif // MODPLUG_TRACKER Modified: trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/ParamEq.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "ParamEq.h" +#include "../../Sndfile.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS Modified: trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Mon May 6 22:48:35 2024 (r20717) +++ trunk/OpenMPT/soundlib/plugins/dmo/WavesReverb.cpp Mon May 6 23:23:53 2024 (r20718) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "WavesReverb.h" +#include "../../Sndfile.h" #endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN |
|
From: <sv...@op...> - 2024-05-06 20:48:46
|
Author: sagamusix Date: Mon May 6 22:48:35 2024 New Revision: 20717 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20717 Log: [Var] Check if removing the assert silences the newly-added cppcheck warning. Nothing in the code changes in r20712 should change anything about this logic, but since the entire class' inner workings require this pointer to be non-null, and it is the only place where it is check, maybe we can simply drop it... Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp Mon May 6 22:02:12 2024 (r20716) +++ trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp Mon May 6 22:48:35 2024 (r20717) @@ -241,8 +241,6 @@ // MIX_R += dryRatio * (WET_L - DRY_L) + wetRatio * (DRY_R - WET_R) // -> mixop == 6: same as normal, but forces dry ratio to 1 - MPT_ASSERT(m_pMixStruct != nullptr); - const PluginMixMode mixop = m_pMixStruct->GetMixMode(); float wetRatio = 1.f - m_pMixStruct->fDryRatio; |
|
From: <sv...@op...> - 2024-05-06 20:02:24
|
Author: sagamusix Date: Mon May 6 22:02:12 2024 New Revision: 20716 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20716 Log: Merged revision(s) 20711 from trunk/OpenMPT: [Fix] Ultratracker: Support the highest three octaves (patch by cs127). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_ult.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_ult.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_ult.cpp Mon May 6 22:01:37 2024 (r20715) +++ branches/OpenMPT-1.31/soundlib/Load_ult.cpp Mon May 6 22:02:12 2024 (r20716) @@ -63,7 +63,7 @@ mptSmp.nSustainEnd = std::min(static_cast<SmpLength>(loopEnd), mptSmp.nLength); mptSmp.nVolume = volume; - mptSmp.nC5Speed = speed; + mptSmp.nC5Speed = speed * 2; // Doubled to fit the note range if(finetune) { mptSmp.Transpose(finetune / (12.0 * 32768.0)); @@ -207,7 +207,7 @@ b = file.ReadUint8(); } - m.note = (b > 0 && b < 61) ? (b + 35 + NOTE_MIN) : NOTE_NONE; + m.note = (b > 0 && b < 97) ? (b + 23 + NOTE_MIN) : NOTE_NONE; const auto [instr, cmd, para1, para2] = file.ReadArray<uint8, 4>(); |
|
From: <sv...@op...> - 2024-05-06 20:01:44
|
Author: sagamusix Date: Mon May 6 22:01:37 2024 New Revision: 20715 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20715 Log: Merged revision(s) 20702 from trunk/OpenMPT: [Mod] MDL: Command 9 is not Set Envelope Position, it select a different envelope instead. As we only have one envelope per type per instrument, instead do the only thing we can do for now: Assume that the instrument envelope was disabled and enable it. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mdl.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mdl.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mdl.cpp Mon May 6 22:00:18 2024 (r20714) +++ branches/OpenMPT-1.31/soundlib/Load_mdl.cpp Mon May 6 22:01:37 2024 (r20715) @@ -168,7 +168,7 @@ /* Either column */ /* 7 */ CMD_TEMPO, /* 8 */ CMD_PANNING8, - /* 9 */ CMD_SETENVPOSITION, + /* 9 */ CMD_S3MCMDEX, /* A */ CMD_NONE, /* B */ CMD_POSITIONJUMP, /* C */ CMD_GLOBALVOLUME, @@ -203,6 +203,16 @@ case 0x08: // Panning param = (param & 0x7F) * 2u; break; + case 0x09: // Set Envelope (we can only have one envelope per type...) + if(param < 0x40) + param = 0x78; // Enable the one volume envelope we have + else if (param < 0x80) + param = 0x7A; // Enable the one panning envelope we have + else if(param < 0xC0) + param = 0x7C; // Enable the one pitch envelope we have + else + cmd = CMD_NONE; + break; case 0x0C: // Global volume param = (param + 1) / 2u; break; |
|
From: <sv...@op...> - 2024-05-06 20:00:30
|
Author: sagamusix Date: Mon May 6 22:00:18 2024 New Revision: 20714 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20714 Log: Merged revision(s) 20650 from trunk/OpenMPT: [Fix] MIDI macro command s didn't compute correct checksum if a device ID was made up from two bytes (e.g. XV-5080). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Modified: branches/OpenMPT-1.31/soundlib/Snd_fx.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Mon May 6 21:58:26 2024 (r20713) +++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Mon May 6 22:00:18 2024 (r20714) @@ -5163,12 +5163,17 @@ { // SysEx Checksum (not an original Impulse Tracker macro variable, but added for convenience) auto startPos = outPos; - while(startPos > 0 && out[--startPos] != 0xF0); - if(outPos - startPos < 5 || out[startPos] != 0xF0) - { + while(startPos > 0 && out[--startPos] != 0xF0) + ; + + if(outPos - startPos < 3 || out[startPos] != 0xF0) continue; - } - for(auto p = startPos + 5u; p != outPos; p++) + + uint8 checksumStart = out[startPos + 3] ? 5 : 6; + if(outPos - startPos < checksumStart) + continue; + + for(auto p = startPos + checksumStart; p != outPos; p++) { data += out[p]; } |
|
From: <sv...@op...> - 2024-05-06 19:58:38
|
Author: sagamusix Date: Mon May 6 21:58:26 2024 New Revision: 20713 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20713 Log: Merged revision(s) 20623 from trunk/OpenMPT: [Mod] IT: ChibiTracker's mixer is about half as loud as ours. Halve the sample pre-amp when ChibiTracker-made IT is detected. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_it.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_it.cpp Mon May 6 20:17:31 2024 (r20712) +++ branches/OpenMPT-1.31/soundlib/Load_it.cpp Mon May 6 21:58:26 2024 (r20713) @@ -1218,6 +1218,7 @@ { madeWithTracker = U_("ChibiTracker"); m_playBehaviour.reset(kITShortSampleRetrig); + m_nSamplePreAmp /= 2; } else if(fileHeader.cwtv == 0x0214 && fileHeader.cmwt == 0x0214 && fileHeader.special <= 1 && fileHeader.pwd == 0 && fileHeader.reserved == 0 && (fileHeader.flags & (ITFileHeader::vol0Optimisations | ITFileHeader::instrumentMode | ITFileHeader::useMIDIPitchController | ITFileHeader::reqEmbeddedMIDIConfig | ITFileHeader::extendedFilterRange)) == ITFileHeader::instrumentMode && m_nSamples > 1 && (Samples[1].filename == "XXXXXXXX.YYY")) |
|
From: <sv...@op...> - 2024-05-06 18:17:44
|
Author: sagamusix Date: Mon May 6 20:17:31 2024 New Revision: 20712 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20712 Log: [Imp] Expanded mix now also works with plugins that have no inputs. [Imp] All mix modes are now available for instrument plugins as well. The old plugin mixing behaviour for instrument plugins is emulated with the new "instrument mix mode" (https://forum.openmpt.org/index.php?topic=7178.0). [Mod] OpenMPT: Version is now 1.32.00.11 Modified: trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/mptrack/SelectPluginDialog.cpp trunk/OpenMPT/mptrack/View_gen.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp trunk/OpenMPT/soundlib/plugins/PluginStructs.h Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/common/versionNumber.h Mon May 6 20:17:31 2024 (r20712) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 10 +#define VER_MINORMINOR 11 OPENMPT_NAMESPACE_END Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/SelectPluginDialog.cpp Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/mptrack/SelectPluginDialog.cpp Mon May 6 20:17:31 2024 (r20712) @@ -166,7 +166,7 @@ { // Enable drymix by default for these known plugins case Vst::FourCC("Scop"): - m_pPlugin->SetWetMix(); + m_pPlugin->SetDryMix(); break; } } @@ -189,6 +189,8 @@ { m_pPlugin->Info.szName = mpt::ToCharset(mpt::Charset::Locale, name); } + m_pPlugin->SetDryMix(p->IsInstrument()); + // Check if plugin slot is already assigned to any instrument, and if not, create one. if(p->IsInstrument() && m_pModDoc->HasInstrumentForPlugin(m_nPlugSlot) == INSTRUMENTINDEX_INVALID) { Modified: trunk/OpenMPT/mptrack/View_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.cpp Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/mptrack/View_gen.cpp Mon May 6 20:17:31 2024 (r20712) @@ -227,6 +227,7 @@ m_CbnSpecialMixProcessing.AddString(_T("Mix Subtract")); m_CbnSpecialMixProcessing.AddString(_T("Middle Subtract")); m_CbnSpecialMixProcessing.AddString(_T("LR Balance")); + m_CbnSpecialMixProcessing.AddString(_T("Instrument")); m_SpinMixGain.SetRange(0, 80); m_SpinMixGain.SetPos(10); SetDlgItemText(IDC_EDIT16, _T("Gain: x1.0")); @@ -448,7 +449,7 @@ SetDlgItemText(IDC_EDIT13, mpt::ToCString(plugin.GetName())); CheckDlgButton(IDC_CHECK9, plugin.IsMasterEffect() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(IDC_CHECK10, plugin.IsBypassed() ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_CHECK11, plugin.IsWetMix() ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_CHECK11, plugin.IsDryMix() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(IDC_CHECK13, plugin.IsAutoSuspendable() ? BST_CHECKED : BST_UNCHECKED); IMixPlugin *pPlugin = plugin.pMixPlugin; m_BtnEdit.EnableWindow((pPlugin != nullptr && (pPlugin->HasEditor() || pPlugin->GetNumParameters())) ? TRUE : FALSE); @@ -457,17 +458,8 @@ GetDlgItem(IDC_CLONEPLUG)->EnableWindow((pPlugin) ? TRUE : FALSE); UpdateDryWetDisplay(); - if(pPlugin && pPlugin->IsInstrument()) - { - m_CbnSpecialMixProcessing.EnableWindow(FALSE); - GetDlgItem(IDC_CHECK12)->EnableWindow(FALSE); - } else - { - m_CbnSpecialMixProcessing.EnableWindow(TRUE); - GetDlgItem(IDC_CHECK12)->EnableWindow(TRUE); - m_CbnSpecialMixProcessing.SetCurSel(plugin.GetMixMode()); - CheckDlgButton(IDC_CHECK12, plugin.IsExpandedMix() ? BST_CHECKED : BST_UNCHECKED); - } + m_CbnSpecialMixProcessing.SetCurSel(static_cast<int>(plugin.GetMixMode())); + CheckDlgButton(IDC_CHECK12, plugin.IsExpandedMix() ? BST_CHECKED : BST_UNCHECKED); int gain = plugin.GetGain(); if(gain == 0) gain = 10; float value = 0.1f * (float)gain; @@ -1342,7 +1334,7 @@ CModDoc *pModDoc = GetDocument(); if ((m_nCurrentPlugin >= MAX_MIXPLUGINS) || (!pModDoc)) return; - pModDoc->GetSoundFile().m_MixPlugins[m_nCurrentPlugin].SetMixMode((uint8)m_CbnSpecialMixProcessing.GetCurSel()); + pModDoc->GetSoundFile().m_MixPlugins[m_nCurrentPlugin].SetMixMode(static_cast<PluginMixMode>(m_CbnSpecialMixProcessing.GetCurSel())); SetPluginModified(); } @@ -1352,7 +1344,7 @@ CModDoc *pModDoc = GetDocument(); if ((m_nCurrentPlugin >= MAX_MIXPLUGINS) || (!pModDoc)) return; - pModDoc->GetSoundFile().m_MixPlugins[m_nCurrentPlugin].SetWetMix(IsDlgButtonChecked(IDC_CHECK11) != BST_UNCHECKED); + pModDoc->GetSoundFile().m_MixPlugins[m_nCurrentPlugin].SetDryMix(IsDlgButtonChecked(IDC_CHECK11) != BST_UNCHECKED); SetPluginModified(); } Modified: trunk/OpenMPT/soundlib/Sndfile.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.cpp Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/soundlib/Sndfile.cpp Mon May 6 20:17:31 2024 (r20712) @@ -735,6 +735,15 @@ { // Plugin was found plugin.pMixPlugin->RestoreAllParameters(plugin.defaultProgram); + + // Special handling for instrument plugins in ProcessMixOps was removed + if(m_dwLastSavedWithVersion < MPT_V("1.32.00.11")) + { + if(plugin.pMixPlugin->IsInstrument()) + plugin.SetMixMode(PluginMixMode::Instrument); + if(!plugin.pMixPlugin->GetNumInputChannels()) + plugin.SetExpandedMix(false); + } } else { // Plugin not found - add to list Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/soundlib/plugins/PlugInterface.cpp Mon May 6 20:17:31 2024 (r20712) @@ -239,24 +239,17 @@ // -> mixop == 4 : MIX -= middle - WET * wetRatio + middle - DRY // -> mixop == 5 : MIX_L += wetRatio * (WET_L - DRY_L) + dryRatio * (DRY_R - WET_R) // MIX_R += dryRatio * (WET_L - DRY_L) + wetRatio * (DRY_R - WET_R) + // -> mixop == 6: same as normal, but forces dry ratio to 1 MPT_ASSERT(m_pMixStruct != nullptr); - int mixop; - if(IsInstrument()) - { - // Force normal mix mode for instruments - mixop = 0; - } else - { - mixop = m_pMixStruct->GetMixMode(); - } + const PluginMixMode mixop = m_pMixStruct->GetMixMode(); - float wetRatio = 1 - m_pMixStruct->fDryRatio; - float dryRatio = IsInstrument() ? 1 : m_pMixStruct->fDryRatio; // Always mix full dry if this is an instrument + float wetRatio = 1.f - m_pMixStruct->fDryRatio; + float dryRatio = (mixop == PluginMixMode::Instrument) ? 1.f : m_pMixStruct->fDryRatio; // Wet / Dry range expansion [0,1] -> [-1,1] - if(GetNumInputChannels() > 0 && m_pMixStruct->IsExpandedMix()) + if(m_pMixStruct->IsExpandedMix()) { wetRatio = 2.0f * wetRatio - 1.0f; dryRatio = -wetRatio; @@ -273,17 +266,17 @@ { // Default mix - case 0: + case PluginMixMode::Default: + case PluginMixMode::Instrument: for(uint32 i = 0; i < numFrames; i++) { - //rewbs.wetratio - added the factors. [20040123] pOutL[i] += leftPlugOutput[i] * wetRatio + plugInputL[i] * dryRatio; pOutR[i] += rightPlugOutput[i] * wetRatio + plugInputR[i] * dryRatio; } break; // Wet subtract - case 1: + case PluginMixMode::WetSubtract: for(uint32 i = 0; i < numFrames; i++) { pOutL[i] += plugInputL[i] - leftPlugOutput[i] * wetRatio; @@ -292,7 +285,7 @@ break; // Dry subtract - case 2: + case PluginMixMode::DrySubtract: for(uint32 i = 0; i < numFrames; i++) { pOutL[i] += leftPlugOutput[i] - plugInputL[i] * dryRatio; @@ -301,7 +294,7 @@ break; // Mix subtract - case 3: + case PluginMixMode::MixSubtract: for(uint32 i = 0; i < numFrames; i++) { pOutL[i] -= leftPlugOutput[i] - plugInputL[i] * wetRatio; @@ -310,17 +303,17 @@ break; // Middle subtract - case 4: + case PluginMixMode::MiddleSubtract: for(uint32 i = 0; i < numFrames; i++) { - float middle = (pOutL[i] + plugInputL[i] + pOutR[i] + plugInputR[i]) / 2.0f; + float middle = (pOutL[i] + plugInputL[i] + pOutR[i] + plugInputR[i]) * 0.5f; pOutL[i] -= middle - leftPlugOutput[i] * wetRatio + middle - plugInputL[i]; pOutR[i] -= middle - rightPlugOutput[i] * wetRatio + middle - plugInputR[i]; } break; // Left / Right balance - case 5: + case PluginMixMode::LRBalance: if(m_pMixStruct->IsExpandedMix()) { wetRatio /= 2.0f; @@ -336,8 +329,8 @@ } // If dry mix is ticked, we add the unprocessed buffer, - // except if this is an instrument since then it has already been done: - if(m_pMixStruct->IsWetMix() && !IsInstrument()) + // except with the instrument mixop as it has already been done: + if(m_pMixStruct->IsDryMix() && mixop != PluginMixMode::Instrument) { for(uint32 i = 0; i < numFrames; i++) { Modified: trunk/OpenMPT/soundlib/plugins/PluginStructs.h ============================================================================== --- trunk/OpenMPT/soundlib/plugins/PluginStructs.h Mon May 6 18:58:40 2024 (r20711) +++ trunk/OpenMPT/soundlib/plugins/PluginStructs.h Mon May 6 20:17:31 2024 (r20712) @@ -32,6 +32,17 @@ #ifndef NO_PLUGINS +enum class PluginMixMode : uint8 +{ + Default = 0, + WetSubtract = 1, + DrySubtract = 2, + MixSubtract = 3, + MiddleSubtract = 4, + LRBalance = 5, + Instrument = 6, +}; + struct SNDMIXPLUGININFO { // dwInputRouting flags @@ -39,7 +50,7 @@ { irApplyToMaster = 0x01, // Apply to master mix irBypass = 0x02, // Bypass effect - irWetMix = 0x04, // Wet Mix (dry added) + irDryMix = 0x04, // Wet Mix (dry added) irExpandMix = 0x08, // [0%,100%] -> [-200%,200%] irAutoSuspend = 0x10, // Plugin will automatically suspend on silence }; @@ -92,12 +103,12 @@ // Input routing getters uint8 GetGain() const { return Info.gain; } - uint8 GetMixMode() const - { return Info.mixMode; } + PluginMixMode GetMixMode() const + { return static_cast<PluginMixMode>(Info.mixMode.get()); } bool IsMasterEffect() const { return (Info.routingFlags & SNDMIXPLUGININFO::irApplyToMaster) != 0; } - bool IsWetMix() const - { return (Info.routingFlags & SNDMIXPLUGININFO::irWetMix) != 0; } + bool IsDryMix() const + { return (Info.routingFlags & SNDMIXPLUGININFO::irDryMix) != 0; } bool IsExpandedMix() const { return (Info.routingFlags & SNDMIXPLUGININFO::irExpandMix) != 0; } bool IsBypassed() const @@ -107,12 +118,12 @@ // Input routing setters void SetGain(uint8 gain); - void SetMixMode(uint8 mixMode) - { Info.mixMode = mixMode; } + void SetMixMode(PluginMixMode mixMode) + { Info.mixMode = static_cast<uint8>(mixMode); } void SetMasterEffect(bool master = true) { if(master) Info.routingFlags |= SNDMIXPLUGININFO::irApplyToMaster; else Info.routingFlags &= uint8(~SNDMIXPLUGININFO::irApplyToMaster); } - void SetWetMix(bool wetMix = true) - { if(wetMix) Info.routingFlags |= SNDMIXPLUGININFO::irWetMix; else Info.routingFlags &= uint8(~SNDMIXPLUGININFO::irWetMix); } + void SetDryMix(bool wetMix = true) + { if(wetMix) Info.routingFlags |= SNDMIXPLUGININFO::irDryMix; else Info.routingFlags &= uint8(~SNDMIXPLUGININFO::irDryMix); } void SetExpandedMix(bool expanded = true) { if(expanded) Info.routingFlags |= SNDMIXPLUGININFO::irExpandMix; else Info.routingFlags &= uint8(~SNDMIXPLUGININFO::irExpandMix); } void SetBypass(bool bypass = true); |
|
From: <sv...@op...> - 2024-05-06 16:58:53
|
Author: sagamusix Date: Mon May 6 18:58:40 2024 New Revision: 20711 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20711 Log: [Fix] Ultratracker: Support the highest three octaves (patch by cs127). Modified: trunk/OpenMPT/soundlib/Load_ult.cpp Modified: trunk/OpenMPT/soundlib/Load_ult.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ult.cpp Mon May 6 09:56:11 2024 (r20710) +++ trunk/OpenMPT/soundlib/Load_ult.cpp Mon May 6 18:58:40 2024 (r20711) @@ -63,7 +63,7 @@ mptSmp.nSustainEnd = std::min(static_cast<SmpLength>(loopEnd), mptSmp.nLength); mptSmp.nVolume = volume; - mptSmp.nC5Speed = speed; + mptSmp.nC5Speed = speed * 2; // Doubled to fit the note range if(finetune) { mptSmp.Transpose(finetune / (12.0 * 32768.0)); @@ -207,7 +207,7 @@ b = file.ReadUint8(); } - m.note = (b > 0 && b < 61) ? (b + 35 + NOTE_MIN) : NOTE_NONE; + m.note = (b > 0 && b < 97) ? (b + 23 + NOTE_MIN) : NOTE_NONE; const auto [instr, cmd, para1, para2] = file.ReadArray<uint8, 4>(); |
|
From: <sv...@op...> - 2024-05-06 07:56:23
|
Author: manx Date: Mon May 6 09:56:11 2024 New Revision: 20710 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20710 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 Mon May 6 09:56:00 2024 (r20709) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon May 6 09:56:11 2024 (r20710) @@ -14,6 +14,9 @@ * [**New**] New `Makefile` `CONFIG=mingw-w64` option `WINDOWS_CRT=[crtdll,msvcrt,ucrt]` to select the toolchain CRT library. + * [**Change**] `build/download_externals.sh` now verifies the integrity of any + downloaded files and uses curl instead of wget. + * 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 |
|
From: <sv...@op...> - 2024-05-06 07:56:07
|
Author: manx Date: Mon May 6 09:56:00 2024 New Revision: 20709 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20709 Log: [Doc] libopenmpt: Update changelog. Modified: trunk/OpenMPT/doc/libopenmpt/changelog.md Modified: trunk/OpenMPT/doc/libopenmpt/changelog.md ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/changelog.md Mon May 6 09:54:18 2024 (r20708) +++ trunk/OpenMPT/doc/libopenmpt/changelog.md Mon May 6 09:56:00 2024 (r20709) @@ -17,6 +17,8 @@ * [**Change**] DOS builds now use zlib, libmpg123, libogg, and libvorbis instead of miniz, minimp3, and stb_vorbis by default. * [**Change**] `Makefile CONFIG=djgpp` now sets `ALLOW_LGPL=1` by default. + * [**Change**] `build/download_externals.sh` now verifies the integrity of any + downloaded files and uses curl instead of wget. * [**Regression**] Support for Emscripten versions older than 3.1.51 has been removed. |
|
From: <sv...@op...> - 2024-05-06 07:54:25
|
Author: manx Date: Mon May 6 09:54:18 2024 New Revision: 20708 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20708 Log: Merged revision(s) 20707 from trunk/OpenMPT: [Imp] build: download_externals: Verify checksum of all externally downloaded files also for download_externals.sh. [Imp] build: download_externals: Allow multiple alternate URLs for download_externals.sh. [Mod] build: download_externals: Use curl for downloading instead of wget. [Ref] build: download_externals: Cleanup and rewrite. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/download_externals.sh Modified: branches/OpenMPT-1.31/build/download_externals.sh ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.sh Sun May 5 17:25:46 2024 (r20707) +++ branches/OpenMPT-1.31/build/download_externals.sh Mon May 6 09:54:18 2024 (r20708) @@ -7,96 +7,83 @@ cd build 2>&1 > /dev/null || true cd .. -function download_and_unpack_tar () { +function download () { set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" - fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" + MPT_GET_FILE_NAME="$1" + MPT_GET_FILE_SIZE="$2" + MPT_GET_FILE_CHECKSUM="$3" + MPT_GET_URLS="$4" + echo "Checking '$MPT_GET_FILE_NAME' ..." + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') + if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then + echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE. Redownloading." + rm -f "$MPT_GET_FILE_NAME" fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - tar xvaf "../../$3" - cd .. - else - tar xvaf "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" - fi - fi - cd .. - return 0 -} - -function download_and_unpack_zip () { - set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}') + if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then + echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM. Redownloading." + rm -f "$MPT_GET_FILE_NAME" fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - unzip "../../$3" - cd .. - else - unzip "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" - fi - fi - cd .. - return 0 -} - -function download_and_unpack_7z () { - set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" - fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - 7z x "../../$3" - cd .. - else - 7z x "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" + for URL in $MPT_GET_URLS; do + if [ ! -f "$MPT_GET_FILE_NAME" ]; then + echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..." + curl -o "$MPT_GET_FILE_NAME" "$URL" + echo "Verifying '$URL' ..." + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') + if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then + echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE." + rm -f "$MPT_GET_FILE_NAME" + fi + fi + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}') + if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then + echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM." + rm -f "$MPT_GET_FILE_NAME" + fi fi fi - cd .. + done + if [ ! -f "$MPT_GET_FILE_NAME" ]; then + echo "Failed to download '$MPT_GET_FILE_NAME'." + return 1 + fi return 0 } -function download () { +function unpack () { set -e - MPT_GET_URL="$1" + MPT_GET_DESTDIR="$1" MPT_GET_FILE="$2" - if [ ! -f "$2" ]; then - wget "$1" -O "$2" + MPT_GET_SUBDIR="$3" + echo "Extracting '$MPT_GET_DESTDIR' from '$MPT_GET_FILE:$MPT_GET_SUBDIR' ..." + EXTENSION="${MPT_GET_FILE##*.}" + if [ -d "$MPT_GET_DESTDIR" ]; then + rm -rf "$MPT_GET_DESTDIR" + fi + mkdir "$MPT_GET_DESTDIR" + case "$EXTENSION" in + tar) + tar -xvaf "$MPT_GET_FILE" -C "$MPT_GET_DESTDIR" + ;; + zip) + unzip -d "$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + 7z) + 7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + exe) + 7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + esac + if [ ! "$MPT_GET_SUBDIR" = "." ]; then + mv "$MPT_GET_DESTDIR" "$MPT_GET_DESTDIR.tmp" + mv "$MPT_GET_DESTDIR.tmp/$MPT_GET_SUBDIR" "$MPT_GET_DESTDIR" fi return 0 } @@ -108,13 +95,16 @@ mkdir build/tools fi +download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" +download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" +download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" +download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" + +unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." +unpack "include/cwsdpmi" "build/externals/csdpmi7b.zip" "." +unpack "include/winamp" "build/externals/WA5.55_SDK.exe" "." +unpack "include/xmplay" "build/externals/xmp-sdk.zip" "." - -download_and_unpack_zip "allegro42" "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." -download_and_unpack_zip "cwsdpmi" "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "." -download "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "build/externals/csdpmi7s.zip" -#download_and_unpack_zip "cwsdpmi" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "." -#download "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" "build/externals/csdpmi7s.zip" -download_and_unpack_7z "winamp" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/WA5.55_SDK.exe" "." ln -s OUT.H include/winamp/Winamp/out.h -download_and_unpack_zip "xmplay" "https://www.un4seen.com/files/xmp-sdk.zip" "build/externals/xmp-sdk.zip" "." + |
|
From: <sv...@op...> - 2024-05-05 15:25:53
|
Author: manx Date: Sun May 5 17:25:46 2024 New Revision: 20707 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20707 Log: [Imp] build: download_externals: Verify checksum of all externally downloaded files also for download_externals.sh. [Imp] build: download_externals: Allow multiple alternate URLs for download_externals.sh. [Mod] build: download_externals: Use curl for downloading instead of wget. [Ref] build: download_externals: Cleanup and rewrite. Modified: trunk/OpenMPT/build/download_externals.sh Modified: trunk/OpenMPT/build/download_externals.sh ============================================================================== --- trunk/OpenMPT/build/download_externals.sh Sun May 5 16:10:14 2024 (r20706) +++ trunk/OpenMPT/build/download_externals.sh Sun May 5 17:25:46 2024 (r20707) @@ -7,96 +7,83 @@ cd build 2>&1 > /dev/null || true cd .. -function download_and_unpack_tar () { +function download () { set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" - fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" + MPT_GET_FILE_NAME="$1" + MPT_GET_FILE_SIZE="$2" + MPT_GET_FILE_CHECKSUM="$3" + MPT_GET_URLS="$4" + echo "Checking '$MPT_GET_FILE_NAME' ..." + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') + if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then + echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE. Redownloading." + rm -f "$MPT_GET_FILE_NAME" fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - tar xvaf "../../$3" - cd .. - else - tar xvaf "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" - fi - fi - cd .. - return 0 -} - -function download_and_unpack_zip () { - set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}') + if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then + echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM. Redownloading." + rm -f "$MPT_GET_FILE_NAME" fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - unzip "../../$3" - cd .. - else - unzip "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" - fi - fi - cd .. - return 0 -} - -function download_and_unpack_7z () { - set -e - MPT_GET_DESTDIR="$1" - MPT_GET_URL="$2" - MPT_GET_FILE="$3" - MPT_GET_SUBDIR="$4" - if [ ! -f "$3" ]; then - wget "$2" -O "$3" fi - cd include - if [ -d "$1" ]; then - rm -rf "$1" - fi - if [ "$4" = "." ]; then - mkdir "$1" - cd "$1" - 7z x "../../$3" - cd .. - else - 7z x "../$3" - if [ ! "$4" = "$1" ]; then - mv "$4" "$1" + for URL in $MPT_GET_URLS; do + if [ ! -f "$MPT_GET_FILE_NAME" ]; then + echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..." + curl -o "$MPT_GET_FILE_NAME" "$URL" + echo "Verifying '$URL' ..." + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s') + if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then + echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE." + rm -f "$MPT_GET_FILE_NAME" + fi + fi + if [ -f "$MPT_GET_FILE_NAME" ]; then + FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}') + if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then + echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM." + rm -f "$MPT_GET_FILE_NAME" + fi fi fi - cd .. + done + if [ ! -f "$MPT_GET_FILE_NAME" ]; then + echo "Failed to download '$MPT_GET_FILE_NAME'." + return 1 + fi return 0 } -function download () { +function unpack () { set -e - MPT_GET_URL="$1" + MPT_GET_DESTDIR="$1" MPT_GET_FILE="$2" - if [ ! -f "$2" ]; then - wget "$1" -O "$2" + MPT_GET_SUBDIR="$3" + echo "Extracting '$MPT_GET_DESTDIR' from '$MPT_GET_FILE:$MPT_GET_SUBDIR' ..." + EXTENSION="${MPT_GET_FILE##*.}" + if [ -d "$MPT_GET_DESTDIR" ]; then + rm -rf "$MPT_GET_DESTDIR" + fi + mkdir "$MPT_GET_DESTDIR" + case "$EXTENSION" in + tar) + tar -xvaf "$MPT_GET_FILE" -C "$MPT_GET_DESTDIR" + ;; + zip) + unzip -d "$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + 7z) + 7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + exe) + 7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE" + ;; + esac + if [ ! "$MPT_GET_SUBDIR" = "." ]; then + mv "$MPT_GET_DESTDIR" "$MPT_GET_DESTDIR.tmp" + mv "$MPT_GET_DESTDIR.tmp/$MPT_GET_SUBDIR" "$MPT_GET_DESTDIR" fi return 0 } @@ -108,13 +95,16 @@ mkdir build/tools fi +download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" +download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" +download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" +download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" +download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" + +unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." +unpack "include/cwsdpmi" "build/externals/csdpmi7b.zip" "." +unpack "include/winamp" "build/externals/WA5.55_SDK.exe" "." +unpack "include/xmplay" "build/externals/xmp-sdk.zip" "." - -download_and_unpack_zip "allegro42" "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "." -download_and_unpack_zip "cwsdpmi" "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "." -download "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "build/externals/csdpmi7s.zip" -#download_and_unpack_zip "cwsdpmi" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "." -#download "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" "build/externals/csdpmi7s.zip" -download_and_unpack_7z "winamp" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/WA5.55_SDK.exe" "." ln -s OUT.H include/winamp/Winamp/out.h -download_and_unpack_zip "xmplay" "https://www.un4seen.com/files/xmp-sdk.zip" "build/externals/xmp-sdk.zip" "." + |
|
From: <sv...@op...> - 2024-05-05 14:10:27
|
Author: sagamusix Date: Sun May 5 16:10:14 2024 New Revision: 20706 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20706 Log: [Imp] Add plugin presets path to sidebar paths when a plugin requests a file browser. Modified: trunk/OpenMPT/mptrack/Vstplug.cpp Modified: trunk/OpenMPT/mptrack/Vstplug.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Vstplug.cpp Sat May 4 19:37:55 2024 (r20705) +++ trunk/OpenMPT/mptrack/Vstplug.cpp Sun May 5 16:10:14 2024 (r20706) @@ -584,8 +584,7 @@ // string in ptr, see below case audioMasterCanDo: - //Other possible Can Do strings are: - if(!strcmp((char*)ptr, HostCanDo::sendVstEvents) + if(!strcmp((char *)ptr, HostCanDo::sendVstEvents) || !strcmp((char *)ptr, HostCanDo::sendVstMidiEvent) || !strcmp((char *)ptr, HostCanDo::sendVstTimeInfo) || !strcmp((char *)ptr, HostCanDo::receiveVstEvents) @@ -769,7 +768,8 @@ } dlg.ExtensionFilter(extensions) .WorkingDirectory(mpt::PathString::FromLocale(workingDir)) - .AddPlace(GetPluginFactory().dllPath.GetDirectoryWithDrive()); + .AddPlace(GetPluginFactory().dllPath.GetDirectoryWithDrive()) + .AddPlace(TrackerSettings::Instance().PathPluginPresets.GetWorkingDir()); if(!dlg.Show(GetEditor())) return 0; |
3 messages has been excluded from this view by a project administrator.
