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
(72) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-03-17 09:46:45
|
Author: manx Date: Mon Mar 17 10:46:37 2025 New Revision: 23046 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23046 Log: [Imp] build: CI: GitHub: CPA: FreeBSD: Update FreeBSD 13 to 13.5. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun Mar 16 21:40:17 2025 (r23045) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Mon Mar 17 10:46:37 2025 (r23046) @@ -26,7 +26,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -37,7 +37,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -50,7 +50,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -62,7 +62,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun Mar 16 21:40:17 2025 (r23045) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Mon Mar 17 10:46:37 2025 (r23046) @@ -30,7 +30,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -54,7 +54,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -66,7 +66,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G @@ -78,7 +78,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@freebsd-13.5 + uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-03-16 20:40:30
|
Author: manx Date: Sun Mar 16 21:40:17 2025 New Revision: 23045 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23045 Log: [Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.5. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun Mar 16 20:30:28 2025 (r23044) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun Mar 16 21:40:17 2025 (r23045) @@ -14,7 +14,7 @@ matrix: include: - { version: '14.2' } - - { version: '13.4' } + - { version: '13.5' } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools @@ -26,7 +26,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -37,7 +37,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -50,7 +50,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -62,7 +62,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun Mar 16 20:30:28 2025 (r23044) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun Mar 16 21:40:17 2025 (r23045) @@ -16,9 +16,9 @@ - { version: '14.2', deps: sys } - { version: '14.2', deps: local } - { version: '14.2', deps: small } - - { version: '13.4', deps: sys } - - { version: '13.4', deps: local } - - { version: '13.4', deps: small } + - { version: '13.5', deps: sys } + - { version: '13.5', deps: local } + - { version: '13.5', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} @@ -30,7 +30,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -54,7 +54,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -66,7 +66,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G @@ -78,7 +78,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@freebsd-13.5 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-03-16 19:30:40
|
Author: manx Date: Sun Mar 16 20:30:28 2025 New Revision: 23044 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23044 Log: [Fix] Work-around <https://github.com/xiph/flac/issues/823>. Modified: trunk/OpenMPT/openmpt123/openmpt123_flac.hpp trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Modified: trunk/OpenMPT/openmpt123/openmpt123_flac.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_flac.hpp Sun Mar 16 20:10:34 2025 (r23043) +++ trunk/OpenMPT/openmpt123/openmpt123_flac.hpp Sun Mar 16 20:30:28 2025 (r23044) @@ -72,7 +72,12 @@ FLAC__stream_encoder_set_sample_rate( encoder, flags.samplerate ); FLAC__stream_encoder_set_compression_level( encoder, 8 ); #if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) - FLAC__stream_encoder_set_num_threads(encoder, static_cast<std::uint32_t>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1)))); + std::uint32_t threads = static_cast<std::uint32_t>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))); + // Work-around <https://github.com/xiph/flac/issues/823>. + //FLAC__stream_encoder_set_num_threads( encoder, threads ); + while ( ( FLAC__stream_encoder_set_num_threads( encoder, threads ) == FLAC__STREAM_ENCODER_SET_NUM_THREADS_TOO_MANY_THREADS ) && ( threads > 1 ) ) { + threads /= 2; + } #endif } ~flac_stream_raii() { Modified: trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp Sun Mar 16 20:10:34 2025 (r23043) +++ trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp Sun Mar 16 20:30:28 2025 (r23044) @@ -695,7 +695,12 @@ FLAC__stream_encoder_set_compression_level(encoder, TrackerSettings::Instance().m_FLACCompressionLevel); #if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) uint32 threads = TrackerSettings::Instance().m_FLACMultithreading ? static_cast<uint32>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) : static_cast<uint32>(1); - FLAC__stream_encoder_set_num_threads(encoder, threads); + // Work-around <https://github.com/xiph/flac/issues/823>. + //FLAC__stream_encoder_set_num_threads(encoder, threads); + while((FLAC__stream_encoder_set_num_threads(encoder, threads) == FLAC__STREAM_ENCODER_SET_NUM_THREADS_TOO_MANY_THREADS) && (threads > 1)) + { + threads /= 2; + } #endif #endif // MODPLUG_TRACKER Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sun Mar 16 20:10:34 2025 (r23043) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sun Mar 16 20:30:28 2025 (r23044) @@ -130,7 +130,12 @@ #if(FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) uint32 threads = settings.Details.FLACMultithreading ? static_cast<uint32>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) : static_cast<uint32>(1); - FLAC__stream_encoder_set_num_threads(encoder, threads); + // Work-around <https://github.com/xiph/flac/issues/823>. + //FLAC__stream_encoder_set_num_threads(encoder, threads); + while((FLAC__stream_encoder_set_num_threads(encoder, threads) == FLAC__STREAM_ENCODER_SET_NUM_THREADS_TOO_MANY_THREADS) && (threads > 1)) + { + threads /= 2; + } #endif if(settings.Tags) |
|
From: <sv...@op...> - 2025-03-16 19:10:53
|
Author: manx Date: Sun Mar 16 20:10:34 2025 New Revision: 23043 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23043 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sun Mar 16 19:49:10 2025 (r23042) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sun Mar 16 20:10:34 2025 (r23043) @@ -128,7 +128,7 @@ int compressionLevel = settings.Details.FLACCompressionLevel; FLAC__stream_encoder_set_compression_level(encoder, compressionLevel); -#if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) +#if(FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) uint32 threads = settings.Details.FLACMultithreading ? static_cast<uint32>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) : static_cast<uint32>(1); FLAC__stream_encoder_set_num_threads(encoder, threads); #endif |
|
From: <sv...@op...> - 2025-03-16 18:49:28
|
Author: manx Date: Sun Mar 16 19:49:10 2025 New Revision: 23042 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23042 Log: [Imp] Stream Export: FLAC: Enable multi-threading by default. It can be disabled via a new hidden setting [Export]FLACMultithreading=true. This depends on <https://github.com/xiph/flac/pull/822>, and is a no-op until our libflac supports multi-threading. [Imp] FLAC Samples: Add hidden setting [Sample Editor]FLACMultithreading=false. As samples are short for the most part, thread creation overhead might dominate the encoding, so this is disabled by default. This has not been benchmarked. This depends on <https://github.com/xiph/flac/pull/822>, and is a no-op until our libflac supports multi-threading. [Imp] openmpt123: Enable FLAC multithreading unconditionally. Modified: trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp trunk/OpenMPT/mptrack/StreamEncoderSettings.h trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h trunk/OpenMPT/openmpt123/openmpt123_flac.hpp trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Modified: trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/mptrack/StreamEncoderSettings.cpp Sun Mar 16 19:49:10 2025 (r23042) @@ -69,6 +69,7 @@ StreamEncoderSettingsConf::StreamEncoderSettingsConf(SettingsContainer &conf, const mpt::ustring §ion) : FLACCompressionLevel(conf, section, U_("FLACCompressionLevel"), Encoder::StreamSettings().FLACCompressionLevel) + , FLACMultithreading(conf, section, U_("FLACMultithreading"), Encoder::StreamSettings().FLACMultithreading) , AUPaddingAlignHint(conf, section, U_("AUPaddingAlignHint"), Encoder::StreamSettings().AUPaddingAlignHint) , MP3ID3v2MinPadding(conf, section, U_("MP3ID3v2MinPadding"), Encoder::StreamSettings().MP3ID3v2MinPadding) , MP3ID3v2PaddingAlignHint(conf, section, U_("MP3ID3v2PaddingAlignHint"), Encoder::StreamSettings().MP3ID3v2PaddingAlignHint) @@ -87,6 +88,7 @@ { Encoder::StreamSettings result; result.FLACCompressionLevel = FLACCompressionLevel; + result.FLACMultithreading = FLACMultithreading; result.AUPaddingAlignHint = AUPaddingAlignHint; result.MP3ID3v2MinPadding = MP3ID3v2MinPadding; result.MP3ID3v2PaddingAlignHint = MP3ID3v2PaddingAlignHint; Modified: trunk/OpenMPT/mptrack/StreamEncoderSettings.h ============================================================================== --- trunk/OpenMPT/mptrack/StreamEncoderSettings.h Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/mptrack/StreamEncoderSettings.h Sun Mar 16 19:49:10 2025 (r23042) @@ -96,6 +96,7 @@ struct StreamEncoderSettingsConf { Setting<int32> FLACCompressionLevel; + Setting<bool> FLACMultithreading; Setting<uint32> AUPaddingAlignHint; Setting<uint32> MP3ID3v2MinPadding; Setting<uint32> MP3ID3v2PaddingAlignHint; Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Sun Mar 16 19:49:10 2025 (r23042) @@ -294,6 +294,7 @@ , sampleEditorDefaultResampler(conf, UL_("Sample Editor"), UL_("DefaultResampler"), SRCMODE_DEFAULT) , m_nFinetuneStep(conf, UL_("Sample Editor"), UL_("FinetuneStep"), 10) , m_FLACCompressionLevel(conf, UL_("Sample Editor"), UL_("FLACCompressionLevel"), 5) + , m_FLACMultithreading(conf, UL_("Sample Editor"), UL_("FLACMultithreading"), false) , compressITI(conf, UL_("Sample Editor"), UL_("CompressITI"), true) , m_MayNormalizeSamplesOnLoad(conf, UL_("Sample Editor"), UL_("MayNormalizeSamplesOnLoad"), true) , previewInFileDialogs(conf, UL_("Sample Editor"), UL_("PreviewInFileDialogs"), false) Modified: trunk/OpenMPT/mptrack/TrackerSettings.h ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/mptrack/TrackerSettings.h Sun Mar 16 19:49:10 2025 (r23042) @@ -878,6 +878,7 @@ Setting<ResamplingMode> sampleEditorDefaultResampler; Setting<int32> m_nFinetuneStep; // Increment finetune by x cents when using spin control. Setting<int32> m_FLACCompressionLevel; // FLAC compression level for saving (0...8) + Setting<bool> m_FLACMultithreading; Setting<bool> compressITI; Setting<bool> m_MayNormalizeSamplesOnLoad; Setting<bool> previewInFileDialogs; Modified: trunk/OpenMPT/openmpt123/openmpt123_flac.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123_flac.hpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/openmpt123/openmpt123_flac.hpp Sun Mar 16 19:49:10 2025 (r23042) @@ -18,6 +18,11 @@ #include "mpt/base/detect.hpp" #include "mpt/base/saturate_round.hpp" +#include <algorithm> +#if MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) +#include <thread> +#endif + #if defined(_MSC_VER) && defined(__clang__) && defined(__c2__) #include <sys/types.h> #if __STDC__ @@ -66,6 +71,9 @@ FLAC__stream_encoder_set_bits_per_sample( encoder, flags.use_float ? 24 : 16 ); FLAC__stream_encoder_set_sample_rate( encoder, flags.samplerate ); FLAC__stream_encoder_set_compression_level( encoder, 8 ); +#if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) + FLAC__stream_encoder_set_num_threads(encoder, static_cast<std::uint32_t>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1)))); +#endif } ~flac_stream_raii() { if ( encoder ) { Modified: trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/soundlib/SampleFormatFLAC.cpp Sun Mar 16 19:49:10 2025 (r23042) @@ -34,6 +34,10 @@ #include "mpt/parse/parse.hpp" //#include "mpt/crc/crc.hpp" #include "OggStream.h" +#include <algorithm> +#if MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) +#include <thread> +#endif #ifdef MPT_WITH_OGG #if MPT_COMPILER_CLANG #pragma clang diagnostic push @@ -689,6 +693,10 @@ FLAC__stream_encoder_set_metadata(encoder, metadata.data(), numBlocks); #ifdef MODPLUG_TRACKER FLAC__stream_encoder_set_compression_level(encoder, TrackerSettings::Instance().m_FLACCompressionLevel); +#if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) + uint32 threads = TrackerSettings::Instance().m_FLACMultithreading ? static_cast<uint32>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) : static_cast<uint32>(1); + FLAC__stream_encoder_set_num_threads(encoder, threads); +#endif #endif // MODPLUG_TRACKER bool success = FLAC__stream_encoder_init_stream(encoder, &FLAC__StreamEncoder_RAII::StreamEncoderWriteCallback, &FLAC__StreamEncoder_RAII::StreamEncoderSeekCallback, &FLAC__StreamEncoder_RAII::StreamEncoderTellCallback, nullptr, &encoder.f) == FLAC__STREAM_ENCODER_INIT_STATUS_OK; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Sun Mar 16 19:49:10 2025 (r23042) @@ -213,6 +213,7 @@ struct StreamSettings { int32 FLACCompressionLevel = 5; // 8 + bool FLACMultithreading = true; uint32 AUPaddingAlignHint = 4096; uint32 MP3ID3v2MinPadding = 1024; uint32 MP3ID3v2PaddingAlignHint = 4096; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sat Mar 15 20:23:48 2025 (r23041) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Sun Mar 16 19:49:10 2025 (r23042) @@ -8,6 +8,7 @@ #include "openmpt/streamencoder/StreamEncoderFLAC.hpp" #include "mpt/base/bit.hpp" +#include "mpt/base/detect.hpp" #include "mpt/base/macros.hpp" #include "mpt/base/pointer.hpp" #include "mpt/base/saturate_cast.hpp" @@ -25,8 +26,12 @@ #include "openmpt/soundfile_data/tags.hpp" #include "openmpt/streamencoder/StreamEncoder.hpp" +#include <algorithm> #include <memory> #include <string> +#if MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) +#include <thread> +#endif #include <vector> #include <cassert> @@ -123,6 +128,11 @@ int compressionLevel = settings.Details.FLACCompressionLevel; FLAC__stream_encoder_set_compression_level(encoder, compressionLevel); +#if (FLAC_API_VERSION_CURRENT >= 14) && MPT_PLATFORM_MULTITHREADED && !defined(MPT_COMPILER_QUIRK_NO_STDCPP_THREADS) + uint32 threads = settings.Details.FLACMultithreading ? static_cast<uint32>(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) : static_cast<uint32>(1); + FLAC__stream_encoder_set_num_threads(encoder, threads); +#endif + if(settings.Tags) { flac_metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); |
|
From: <sv...@op...> - 2025-03-15 19:24:00
|
Author: manx Date: Sat Mar 15 20:23:48 2025 New Revision: 23041 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23041 Log: [Var] mptCPU: Delete outdated comment. Modified: trunk/OpenMPT/common/mptCPU.h Modified: trunk/OpenMPT/common/mptCPU.h ============================================================================== --- trunk/OpenMPT/common/mptCPU.h Sat Mar 15 20:23:09 2025 (r23040) +++ trunk/OpenMPT/common/mptCPU.h Sat Mar 15 20:23:48 2025 (r23041) @@ -28,9 +28,6 @@ #ifdef MPT_ENABLE_ARCH_INTRINSICS - - - #if defined(MODPLUG_TRACKER) && !defined(MPT_BUILD_WINESUPPORT) @@ -93,11 +90,6 @@ #endif // MODPLUG_TRACKER - - - -// legacy interface - namespace feature = mpt::arch::current::feature; namespace mode = mpt::arch::current::mode; @@ -112,8 +104,6 @@ } - - #endif // MPT_ENABLE_ARCH_INTRINSICS |
|
From: <sv...@op...> - 2025-03-15 19:23:32
|
Author: manx Date: Sat Mar 15 20:23:09 2025 New Revision: 23040 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23040 Log: [Ref] mptTime: Remove unused include. Modified: trunk/OpenMPT/common/mptTime.h Modified: trunk/OpenMPT/common/mptTime.h ============================================================================== --- trunk/OpenMPT/common/mptTime.h Sat Mar 15 20:12:40 2025 (r23039) +++ trunk/OpenMPT/common/mptTime.h Sat Mar 15 20:23:09 2025 (r23040) @@ -18,7 +18,6 @@ #elif MPT_CXX_AT_LEAST(17) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && defined(MODPLUG_TRACKER) #include <chrono> #endif -#include <string> #if MPT_CXX_BEFORE(20) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) #include <ctime> |
|
From: <sv...@op...> - 2025-03-15 19:12:52
|
Author: sagamusix Date: Sat Mar 15 20:12:40 2025 New Revision: 23039 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23039 Log: [Imp] Missing Sample Dialog: When browsing for a folder (and modern file browsing dialog is available), add the folder containing the module to the Places list. Relates to https://bugs.openmpt.org/view.php?id=1864 Modified: trunk/OpenMPT/mptrack/ExternalSamples.cpp trunk/OpenMPT/mptrack/FileDialog.cpp trunk/OpenMPT/mptrack/FileDialog.h Modified: trunk/OpenMPT/mptrack/ExternalSamples.cpp ============================================================================== --- trunk/OpenMPT/mptrack/ExternalSamples.cpp Sat Mar 15 20:12:32 2025 (r23038) +++ trunk/OpenMPT/mptrack/ExternalSamples.cpp Sat Mar 15 20:12:40 2025 (r23039) @@ -124,6 +124,7 @@ } BrowseForFolder dlg(TrackerSettings::Instance().PathSamples.GetWorkingDir(), _T("Select a folder to search for missing samples...")); + dlg.AddPlace(m_modDoc.GetPathNameMpt().GetDirectoryWithDrive()); if(dlg.Show()) { TrackerSettings::Instance().PathSamples.SetWorkingDir(dlg.GetDirectory()); Modified: trunk/OpenMPT/mptrack/FileDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/FileDialog.cpp Sat Mar 15 20:12:32 2025 (r23038) +++ trunk/OpenMPT/mptrack/FileDialog.cpp Sat Mar 15 20:12:40 2025 (r23039) @@ -239,6 +239,12 @@ { CFileDialogEx dlg{FileDialogType::BrowseForFolder, nullptr, m_workingDirectory.AsNative().c_str(), 0, nullptr, parent, 0, TRUE, false}; dlg.m_ofn.lpstrTitle = m_caption; +#if MPT_WINNT_AT_LEAST(MPT_WIN_VISTA) + for(const auto &place : m_places) + { + dlg.AddPlace(place); + } +#endif if(dlg.DoModal() != IDOK) return false; m_workingDirectory = mpt::PathString::FromCString(dlg.GetPathName()); Modified: trunk/OpenMPT/mptrack/FileDialog.h ============================================================================== --- trunk/OpenMPT/mptrack/FileDialog.h Sat Mar 15 20:12:32 2025 (r23038) +++ trunk/OpenMPT/mptrack/FileDialog.h Sat Mar 15 20:12:40 2025 (r23039) @@ -117,11 +117,15 @@ { protected: mpt::PathString m_workingDirectory; + std::vector<mpt::PathString> m_places; CString m_caption; public: BrowseForFolder(const mpt::PathString &dir, const CString &caption) : m_workingDirectory(dir), m_caption(caption) { } + // Add a directory to the application-specific quick-access directories in the file dialog + BrowseForFolder &AddPlace(mpt::PathString path) { m_places.push_back(std::move(path)); return *this; } + // Show the folder selection dialog. bool Show(CWnd *parent = nullptr); |
|
From: <sv...@op...> - 2025-03-15 19:12:44
|
Author: manx Date: Sat Mar 15 20:12:32 2025 New Revision: 23038 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23038 Log: [Fix] build: Makefile: AOCC: Limit AOCC 5.0.0 (AMD compiler, based on Clang 17.0.6) to C++20 by default. It errors out in libstdc++ 14 when trying to do overload resolution where one overload takes a std::pair during considering conversions to std::pair. This should be a SFINAE context and not a hard error. It works in C++20 mode. A language-level work-around does not appear to be feasible because it affects internal code paths of std::map. Modified: trunk/OpenMPT/build/make/config-aocc.mk Modified: trunk/OpenMPT/build/make/config-aocc.mk ============================================================================== --- trunk/OpenMPT/build/make/config-aocc.mk Sat Mar 15 17:24:25 2025 (r23037) +++ trunk/OpenMPT/build/make/config-aocc.mk Sat Mar 15 20:12:32 2025 (r23038) @@ -12,6 +12,8 @@ AR = $(TOOLCHAIN_PREFIX)ar$(TOOLCHAIN_SUFFIX) endif +STDCXX?=c++20 + ifneq ($(STDCXX),) CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23) |
|
From: <sv...@op...> - 2025-03-15 16:24:42
|
Author: manx Date: Sat Mar 15 17:24:25 2025 New Revision: 23037 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23037 Log: [Ref] mptPathString: Remove GetAbsolutePath(). mpt::fs::absolute() does the same thing. Modified: trunk/OpenMPT/common/mptPathString.cpp trunk/OpenMPT/common/mptPathString.h trunk/OpenMPT/mptrack/Mptrack.cpp Modified: trunk/OpenMPT/common/mptPathString.cpp ============================================================================== --- trunk/OpenMPT/common/mptPathString.cpp Sat Mar 15 15:29:50 2025 (r23036) +++ trunk/OpenMPT/common/mptPathString.cpp Sat Mar 15 17:24:25 2025 (r23037) @@ -88,27 +88,6 @@ -#if !(MPT_WINRT_BEFORE(MPT_WIN_10)) - -mpt::PathString GetAbsolutePath(const mpt::PathString &path) -{ - DWORD size = GetFullPathName(path.AsNative().c_str(), 0, nullptr, nullptr); - if(size == 0) - { - return path; - } - std::vector<TCHAR> fullPathName(size, TEXT('\0')); - if(GetFullPathName(path.AsNative().c_str(), size, fullPathName.data(), nullptr) == 0) - { - return path; - } - return mpt::PathString::FromNative(fullPathName.data()); -} - -#endif - - - #endif // MODPLUG_TRACKER && MPT_OS_WINDOWS Modified: trunk/OpenMPT/common/mptPathString.h ============================================================================== --- trunk/OpenMPT/common/mptPathString.h Sat Mar 15 15:29:50 2025 (r23036) +++ trunk/OpenMPT/common/mptPathString.h Sat Mar 15 17:24:25 2025 (r23037) @@ -80,13 +80,6 @@ -#if !(MPT_WINRT_BEFORE(MPT_WIN_10)) -// Returns the absolute path for a potentially relative path and removes ".." or "." components. (same as GetFullPathNameW) -mpt::PathString GetAbsolutePath(const mpt::PathString &path); -#endif - - - // Relative / absolute paths conversion mpt::PathString AbsolutePathToRelative(const mpt::PathString &p, const mpt::PathString &relativeTo); // similar to std::fs::path::lexically_approximate Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sat Mar 15 15:29:50 2025 (r23036) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sat Mar 15 17:24:25 2025 (r23037) @@ -969,16 +969,18 @@ } if(modeSourceProject) { - m_InstallPath = mpt::GetAbsolutePath(exePath + P_("..\\") + P_("..\\") + P_("..\\") + P_("..\\")); - m_InstallBinPath = mpt::GetAbsolutePath(exePath + P_("..\\")); + mpt::native_fs fs; + m_InstallPath = fs.absolute(exePath + P_("..\\") + P_("..\\") + P_("..\\") + P_("..\\")); + m_InstallBinPath = fs.absolute(exePath + P_("..\\")); m_InstallBinArchPath = exePath; - m_InstallPkgPath = mpt::GetAbsolutePath(exePath + P_("..\\") + P_("..\\") + P_("..\\") + P_("..\\packageTemplate\\")); + m_InstallPkgPath = fs.absolute(exePath + P_("..\\") + P_("..\\") + P_("..\\") + P_("..\\packageTemplate\\")); } else if(modeMultiArch) { - m_InstallPath = mpt::GetAbsolutePath(exePath + P_("..\\") + P_("..\\")); - m_InstallBinPath = mpt::GetAbsolutePath(exePath + P_("..\\")); + mpt::native_fs fs; + m_InstallPath = fs.absolute(exePath + P_("..\\") + P_("..\\")); + m_InstallBinPath = fs.absolute(exePath + P_("..\\")); m_InstallBinArchPath = exePath; - m_InstallPkgPath = mpt::GetAbsolutePath(exePath + P_("..\\") + P_("..\\")); + m_InstallPkgPath = fs.absolute(exePath + P_("..\\") + P_("..\\")); } else { m_InstallPath = exePath; |
|
From: <sv...@op...> - 2025-03-15 14:30:08
|
Author: manx Date: Sat Mar 15 15:29:50 2025 New Revision: 23036 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23036 Log: [Ref] serialization utils: Remove Max values from enums. Modified: trunk/OpenMPT/common/serialization_utils.h Modified: trunk/OpenMPT/common/serialization_utils.h ============================================================================== --- trunk/OpenMPT/common/serialization_utils.h Sat Mar 15 13:56:01 2025 (r23035) +++ trunk/OpenMPT/common/serialization_utils.h Sat Mar 15 15:29:50 2025 (r23036) @@ -60,7 +60,6 @@ Failure = 0x2, Note = 0x1, None = 0x0, - Max = 0xff, }; enum class StatusMessages : uint32 @@ -89,8 +88,6 @@ SNW_INSUFFICIENT_DATASIZETYPE = 0x00'10'00'00, SNRW_BADGIVEN_STREAM = 0x01'00'00'00, - - Max = 0xffffffff, }; struct Status @@ -149,6 +146,7 @@ RwfRTwoBytesDescChar, // Read. True if map description characters are two bytes. RwfRHeaderIsRead, // Read. True when header is read. RwfRwHasMap, // Read/write. True if map exists. + RwfNumFlags }; |
|
From: <sv...@op...> - 2025-03-15 12:56:20
|
Author: manx Date: Sat Mar 15 13:56:01 2025 New Revision: 23035 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23035 Log: [Ref] mptTime: Increase precision of logfile timestamps. Modified: trunk/OpenMPT/common/mptTime.cpp Modified: trunk/OpenMPT/common/mptTime.cpp ============================================================================== --- trunk/OpenMPT/common/mptTime.cpp Sat Mar 15 13:43:32 2025 (r23034) +++ trunk/OpenMPT/common/mptTime.cpp Sat Mar 15 13:56:01 2025 (r23035) @@ -54,7 +54,11 @@ uint64 Now() { FILETIME filetime; +#if MPT_WIN_AT_LEAST(MPT_WIN_8) + GetSystemTimePreciseAsFileTime(&filetime); +#else GetSystemTimeAsFileTime(&filetime); +#endif return ((uint64)filetime.dwHighDateTime << 32 | filetime.dwLowDateTime); } |
|
From: <sv...@op...> - 2025-03-15 12:43:44
|
Author: manx Date: Sat Mar 15 13:43:32 2025 New Revision: 23034 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23034 Log: [Fix] mptTime: Fix inverted preprocessor logic. Broken since r23031. Modified: trunk/OpenMPT/common/mptTime.h Modified: trunk/OpenMPT/common/mptTime.h ============================================================================== --- trunk/OpenMPT/common/mptTime.h Sat Mar 15 13:33:26 2025 (r23033) +++ trunk/OpenMPT/common/mptTime.h Sat Mar 15 13:43:32 2025 (r23034) @@ -20,7 +20,7 @@ #endif #include <string> -#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) +#if MPT_CXX_BEFORE(20) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) #include <ctime> #endif @@ -176,7 +176,7 @@ } }; -#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) +#if MPT_CXX_BEFORE(20) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO) || defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) inline Unix UnixNow() { |
|
From: <sv...@op...> - 2025-03-15 12:33:55
|
Author: manx Date: Sat Mar 15 13:33:26 2025 New Revision: 23033 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23033 Log: Merged revision(s) 23032 from trunk/OpenMPT: [Fix] mpt/base/detect_quirks.hpp: Also apply MPT_LIBCXX_QUIRK_CHRONO_TZ_MEMLEAK for VS2022.13. It's still not fixed. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Sat Mar 15 13:33:06 2025 (r23032) +++ branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Sat Mar 15 13:33:26 2025 (r23033) @@ -276,7 +276,7 @@ #elif MPT_LIBCXX_GNU #define MPT_LIBCXX_QUIRK_NO_CHRONO_DATE_PARSE #endif -#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 9) || !MPT_COMPILER_MSVC) +#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 14) || !MPT_COMPILER_MSVC) // Causes massive memory leaks. // See // <https://developercommunity.visualstudio.com/t/stdchronoget-tzdb-list-memory-leak/1644641> |
|
From: <sv...@op...> - 2025-03-15 12:33:28
|
Author: manx Date: Sat Mar 15 13:33:06 2025 New Revision: 23032 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23032 Log: [Fix] mpt/base/detect_quirks.hpp: Also apply MPT_LIBCXX_QUIRK_CHRONO_TZ_MEMLEAK for VS2022.13. It's still not fixed. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sat Mar 15 13:30:57 2025 (r23031) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sat Mar 15 13:33:06 2025 (r23032) @@ -333,7 +333,7 @@ #elif MPT_LIBCXX_GNU #define MPT_LIBCXX_QUIRK_NO_CHRONO_DATE_PARSE #endif -#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 9) || !MPT_COMPILER_MSVC) +#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 14) || !MPT_COMPILER_MSVC) // Causes massive memory leaks. // See // <https://developercommunity.visualstudio.com/t/stdchronoget-tzdb-list-memory-leak/1644641> |
|
From: <sv...@op...> - 2025-03-15 12:31:10
|
Author: manx Date: Sat Mar 15 13:30:57 2025 New Revision: 23031 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23031 Log: [Ref] mptTime: Enable C++20 chrono even when MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME. Only use fallback for timezones specifically. [Ref] mptTime: Only reference std::time when needed. Modified: trunk/OpenMPT/common/mptTime.cpp trunk/OpenMPT/common/mptTime.h Modified: trunk/OpenMPT/common/mptTime.cpp ============================================================================== --- trunk/OpenMPT/common/mptTime.cpp Sat Mar 15 12:21:08 2025 (r23030) +++ trunk/OpenMPT/common/mptTime.cpp Sat Mar 15 13:30:57 2025 (r23031) @@ -17,7 +17,7 @@ #include "mptStringBuffer.h" -#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) && !(defined(MODPLUG_TRACKER) && defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME)) +#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) #include <chrono> #endif @@ -25,6 +25,10 @@ #include <optional> #endif // MODPLUG_TRACKER && MPT_OS_WINDOWS +#if defined(MPT_FALLBACK_TIMEZONE_C) +#include <ctime> +#endif // MPT_FALLBACK_TIMEZONE_C + #if MPT_OS_WINDOWS #include <windows.h> #endif @@ -38,6 +42,8 @@ namespace Date { + + #if defined(MODPLUG_TRACKER) #if MPT_OS_WINDOWS @@ -88,6 +94,8 @@ #endif // MODPLUG_TRACKER + + namespace nochrono { Modified: trunk/OpenMPT/common/mptTime.h ============================================================================== --- trunk/OpenMPT/common/mptTime.h Sat Mar 15 12:21:08 2025 (r23030) +++ trunk/OpenMPT/common/mptTime.h Sat Mar 15 13:30:57 2025 (r23031) @@ -20,7 +20,9 @@ #endif #include <string> +#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) #include <ctime> +#endif #if MPT_WINNT_AT_LEAST(MPT_WIN_8) #define MPT_FALLBACK_TIMEZONE_WINDOWS_HISTORIC @@ -66,6 +68,8 @@ namespace Date { + + #if defined(MODPLUG_TRACKER) #if MPT_OS_WINDOWS @@ -84,6 +88,8 @@ #endif // MODPLUG_TRACKER + + enum class LogicalTimezone { Unspecified, @@ -170,11 +176,15 @@ } }; +#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) + inline Unix UnixNow() { return Unix{static_cast<int64>(std::time(nullptr))}; } +#endif + inline int64 UnixAsSeconds(Unix tp) { return tp.value; @@ -199,7 +209,7 @@ } // namespace nochrono -#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) && !(defined(MODPLUG_TRACKER) && defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME)) +#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) using Unix = std::chrono::system_clock::time_point; @@ -262,6 +272,7 @@ inline mpt::Date::Unix UnixFromLocal(Local local) { +#if !defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME) try { std::chrono::time_point<std::chrono::local_t, std::chrono::seconds> local_tp = @@ -279,6 +290,7 @@ return std::chrono::zoned_time{std::chrono::current_zone(), local_tp}.get_sys_time(); #endif } catch(const std::exception &) +#endif { return mpt::Date::UnixFromSeconds(mpt::Date::nochrono::UnixAsSeconds(mpt::Date::nochrono::UnixFromLocal(local))); } @@ -286,6 +298,7 @@ inline mpt::Date::Local UnixAsLocal(Unix tp) { +#if !defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME) try { std::chrono::zoned_time local_tp{ std::chrono::current_zone(), tp }; @@ -301,6 +314,7 @@ result.seconds = static_cast<int64>(hms.seconds().count()); return result; } catch(const std::exception &) +#endif { return mpt::Date::nochrono::UnixAsLocal(mpt::Date::nochrono::UnixFromSeconds(mpt::Date::UnixAsSeconds(tp))); } |
|
From: <sv...@op...> - 2025-03-15 11:21:28
|
Author: manx Date: Sat Mar 15 12:21:08 2025 New Revision: 23030 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23030 Log: [Ref] Move common/Dither.h into soundlib/AudioReadTarget.h. Deleted: trunk/OpenMPT/common/Dither.h Modified: trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win8/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/Mod2wave.cpp trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/soundlib/AudioReadTarget.h trunk/OpenMPT/test/test.cpp Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/autotools/Makefile.am Sat Mar 15 12:21:08 2025 (r23030) @@ -330,7 +330,6 @@ MPT_FILES_COMMON += common/BuildSettingsCompiler.h MPT_FILES_COMMON += common/ComponentManager.cpp MPT_FILES_COMMON += common/ComponentManager.h -MPT_FILES_COMMON += common/Dither.h MPT_FILES_COMMON += common/FileReader.h MPT_FILES_COMMON += common/FileReaderFwd.h MPT_FILES_COMMON += common/GzipWriter.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -640,7 +640,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -231,9 +231,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -646,7 +646,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -646,7 +646,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -676,7 +676,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -195,9 +195,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -628,7 +628,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -225,9 +225,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -640,7 +640,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -231,9 +231,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -760,7 +760,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -646,7 +646,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -646,7 +646,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -676,7 +676,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -195,9 +195,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -628,7 +628,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -225,9 +225,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -769,7 +769,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -637,7 +637,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -240,9 +240,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -769,7 +769,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -769,7 +769,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -643,7 +643,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -643,7 +643,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -673,7 +673,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -201,9 +201,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -661,7 +661,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -231,9 +231,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1971,7 +1971,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1641,7 +1641,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -240,9 +240,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1971,7 +1971,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1971,7 +1971,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -291,9 +291,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1656,7 +1656,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1656,7 +1656,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -177,9 +177,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1731,7 +1731,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -201,9 +201,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1701,7 +1701,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -231,9 +231,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1549,7 +1549,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1237,7 +1237,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -231,9 +231,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1549,7 +1549,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> <ClInclude Include="..\..\common\GzipWriter.h" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 12:21:08 2025 (r23030) @@ -282,9 +282,6 @@ <ClInclude Include="..\..\common\ComponentManager.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\..\common\Dither.h"> - <Filter>common</Filter> - </ClInclude> <ClInclude Include="..\..\common\FileReader.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sat Mar 15 12:21:08 2025 (r23030) @@ -1549,7 +1549,6 @@ <ClInclude Include="..\..\common\BuildSettings.h" /> <ClInclude Include="..\..\common\BuildSettingsCompiler.h" /> <ClInclude Include="..\..\common\ComponentManager.h" /> - <ClInclude Include="..\..\common\Dither.h" /> <ClInclude I... [truncated message content] |
Author: manx Date: Sat Mar 15 10:13:52 2025 New Revision: 23029 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23029 Log: [Ref] Split mptClock from mptTime. Added: trunk/OpenMPT/misc/mptClock.cpp - copied, changed from r23028, trunk/OpenMPT/common/mptTime.cpp trunk/OpenMPT/misc/mptClock.h - copied, changed from r23028, trunk/OpenMPT/common/mptTime.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win8/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters trunk/OpenMPT/common/mptTime.cpp trunk/OpenMPT/common/mptTime.h trunk/OpenMPT/mptrack/Ctrl_gen.cpp trunk/OpenMPT/mptrack/Ctrl_gen.h trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/plugins/MidiInOut.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -711,6 +711,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -945,6 +946,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -444,6 +444,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1142,6 +1145,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -699,6 +699,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -901,6 +902,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -438,6 +438,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1040,6 +1043,9 @@ <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp"> <Filter>installer\updatesigntool</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -711,6 +711,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -945,6 +946,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -444,6 +444,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1142,6 +1145,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -831,6 +831,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1279,6 +1280,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -699,6 +699,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -901,6 +902,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -438,6 +438,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1040,6 +1043,9 @@ <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp"> <Filter>installer\updatesigntool</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -850,6 +850,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1298,6 +1299,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -718,6 +718,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -952,6 +953,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -483,6 +483,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1181,6 +1184,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -850,6 +850,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1298,6 +1299,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -850,6 +850,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1298,6 +1299,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -732,6 +732,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -934,6 +935,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -444,6 +444,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1046,6 +1049,9 @@ <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp"> <Filter>installer\updatesigntool</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -2052,6 +2052,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2500,6 +2501,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1722,6 +1722,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1956,6 +1957,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -483,6 +483,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1181,6 +1184,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -2052,6 +2052,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2500,6 +2501,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -2052,6 +2052,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2500,6 +2501,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -534,6 +534,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1874,6 +1877,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1772,6 +1772,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1974,6 +1975,7 @@ <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -444,6 +444,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1046,6 +1049,9 @@ <ClCompile Include="..\..\installer\updatesigntool\updatesigntool.cpp"> <Filter>installer\updatesigntool</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1620,6 +1620,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2068,6 +2069,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1308,6 +1308,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1542,6 +1543,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -444,6 +444,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1142,6 +1145,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1620,6 +1620,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2068,6 +2069,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1620,6 +1620,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -2068,6 +2069,7 @@ <ClCompile Include="..\..\common\mptTime.cpp" /> <ClCompile Include="..\..\common\serialization_utils.cpp" /> <ClCompile Include="..\..\common\version.cpp" /> + <ClCompile Include="..\..\misc\mptClock.cpp" /> <ClCompile Include="..\..\misc\mptColor.cpp" /> <ClCompile Include="..\..\misc\mptFileCompression.cpp" /> <ClCompile Include="..\..\misc\mptLibrary.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Sat Mar 15 10:13:52 2025 (r23029) @@ -495,6 +495,9 @@ <ClInclude Include="..\..\misc\WriteMemoryDump.h"> <Filter>misc</Filter> </ClInclude> + <ClInclude Include="..\..\misc\mptClock.h"> + <Filter>misc</Filter> + </ClInclude> <ClInclude Include="..\..\misc\mptColor.h"> <Filter>misc</Filter> </ClInclude> @@ -1835,6 +1838,9 @@ <ClCompile Include="..\..\common\version.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\misc\mptClock.cpp"> + <Filter>misc</Filter> + </ClCompile> <ClCompile Include="..\..\misc\mptColor.cpp"> <Filter>misc</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj Fri Mar 14 19:55:26 2025 (r23028) +++ trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj Sat Mar 15 10:13:52 2025 (r23029) @@ -1356,6 +1356,7 @@ <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley.hpp" /> <ClInclude Include="..\..\include\nlohmann-json\include\nlohmann\thirdparty\hedley\hedley_undef.hpp" /> <ClInclude Include="..\..\misc\WriteMemoryDump.h" /> + <ClInclude Include="..\..\misc\mptClock.h" /> <ClInclude Include="..\..\misc\mptColor.h" /> <ClInclude Include="..\..\misc\mptFileCompression.h" /> <ClInclude Include="..\..\misc\mptLibrary.h" /> @@ -1558,6 +155... [truncated message content] |
|
From: <sv...@op...> - 2025-03-14 18:55:38
|
Author: manx Date: Fri Mar 14 19:55:26 2025 New Revision: 23028 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23028 Log: [Var] InnoSetup: Update to 6.4.2. Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Fri Mar 14 15:58:22 2025 (r23027) +++ trunk/OpenMPT/build/download_externals.cmd Fri Mar 14 19:55:26 2025 (r23028) @@ -52,7 +52,7 @@ call :killdir "build\tools\innosetup" || goto error mkdir "build\tools\innosetup" || goto error -"build\externals\innosetup-6.4.1.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error +"build\externals\innosetup-6.4.2.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup5" || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Fri Mar 14 15:58:22 2025 (r23027) +++ trunk/OpenMPT/build/download_externals.txt Fri Mar 14 19:55:26 2025 (r23028) @@ -6,7 +6,7 @@ "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.13.2-embed-amd64.zip" 10854852 a87d1d8e74efd79de42459ab18761406d398a246cddba4832f748bc3bfe3d9b8945ff4d0a29e95c770ca9a13d120c924b7ea514af6db5905e5821ace2ec53723 "https://www.python.org/ftp/python/3.13.2/python-3.13.2-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" -"build/externals/innosetup-6.4.1.exe" 6236000 5dfc9999e2feafa28754baaf80cf73ac96414228b94a1132a919554a822c892810197305d9355885b9ac408c214691cd45279fc2df3a891fbebc4f8eb86bac87 "https://files.jrsoftware.org/is/6/innosetup-6.4.1.exe" "https://files.innosetup.nl/innosetup-6.4.1.exe" +"build/externals/innosetup-6.4.2.exe" 6310880 ff1522e05e59a41c8705d5da072a187eb0a414b670f1538e6d2b634a6f64a2b386f95b6cefc191fecc3673b25bdf2901f547c0b6cd725d9796e214db7ac0af86 "https://files.jrsoftware.org/is/6/innosetup-6.4.2.exe" "https://files.innosetup.nl/innosetup-6.4.2.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" "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" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" |
|
From: <sv...@op...> - 2025-03-14 14:58:34
|
Author: manx Date: Fri Mar 14 15:58:22 2025 New Revision: 23027 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23027 Log: [Ref] mpt/library/library.hpp: Small cleanup. Modified: trunk/OpenMPT/src/mpt/library/library.hpp Modified: trunk/OpenMPT/src/mpt/library/library.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:57:18 2025 (r23026) +++ trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:58:22 2025 (r23027) @@ -488,12 +488,15 @@ static_assert(std::is_function<Tfunc>::value); #endif auto sym_ptr = get_address(symbol); + if (!sym_ptr) { + return false; + } if constexpr (std::is_same<decltype(sym_ptr), void *>::value) { f = reinterpret_cast<Tfunc *>(sym_ptr); } else { f = mpt::function_pointer_cast<Tfunc *>(sym_ptr); } - return (sym_ptr != nullptr); + return true; } template <typename Tdata> @@ -504,12 +507,15 @@ static_assert(!std::is_function<Tdata>::value); #endif auto sym_ptr = get_address(symbol); + if (!sym_ptr) { + return false; + } if constexpr (std::is_same<decltype(sym_ptr), void *>::value) { d = static_cast<Tdata *>(sym_ptr); } else { d = reinterpret_cast<Tdata *>(sym_ptr); } - return (sym_ptr != nullptr); + return true; } }; |
|
From: <sv...@op...> - 2025-03-14 14:57:31
|
Author: manx Date: Fri Mar 14 15:57:18 2025 New Revision: 23026 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23026 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/library/library.hpp Modified: trunk/OpenMPT/src/mpt/library/library.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:49:35 2025 (r23025) +++ trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:57:18 2025 (r23026) @@ -481,7 +481,7 @@ #endif template <typename Tfunc> - bool bind_function(Tfunc * & f, const std::string & symbol) const { + bool bind_function(Tfunc *& f, const std::string & symbol) const { #if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. @@ -497,7 +497,7 @@ } template <typename Tdata> - bool bind_data(Tdata * & d, const std::string & symbol) const { + bool bind_data(Tdata *& d, const std::string & symbol) const { #if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. |
|
From: <sv...@op...> - 2025-03-14 14:49:47
|
Author: manx Date: Fri Mar 14 15:49:35 2025 New Revision: 23025 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23025 Log: [Ref] mpt/library/library.hpp: Add bind_data(), and rename bind() to bind_function(). Modified: trunk/OpenMPT/misc/mptLibrary.cpp trunk/OpenMPT/misc/mptOS.cpp trunk/OpenMPT/misc/mptWine.cpp trunk/OpenMPT/src/mpt/library/library.hpp Modified: trunk/OpenMPT/misc/mptLibrary.cpp ============================================================================== --- trunk/OpenMPT/misc/mptLibrary.cpp Fri Mar 14 15:21:58 2025 (r23024) +++ trunk/OpenMPT/misc/mptLibrary.cpp Fri Mar 14 15:49:35 2025 (r23025) @@ -120,7 +120,7 @@ return nullptr; } FuncPtr result = nullptr; - lib->bind(result, symbol); + lib->bind_function(result, symbol); return result; } Modified: trunk/OpenMPT/misc/mptOS.cpp ============================================================================== --- trunk/OpenMPT/misc/mptOS.cpp Fri Mar 14 15:21:58 2025 (r23024) +++ trunk/OpenMPT/misc/mptOS.cpp Fri Mar 14 15:49:35 2025 (r23025) @@ -381,7 +381,7 @@ if(kernel32.has_value()) { BOOL (WINAPI * fIsWow64Process2)(HANDLE hProcess, USHORT *pProcessMachine, USHORT *pNativeMachine) = NULL; - if(kernel32->bind(fIsWow64Process2, "IsWow64Process2")) + if(kernel32->bind_function(fIsWow64Process2, "IsWow64Process2")) { USHORT ProcessMachine = 0; USHORT NativeMachine = 0; @@ -617,9 +617,9 @@ const char * (__cdecl * wine_get_version)(void) = nullptr; const char * (__cdecl * wine_get_build_id)(void) = nullptr; void (__cdecl * wine_get_host_version)(const char * *, const char * *) = nullptr; - NTDLL->bind(wine_get_version, "wine_get_version"); - NTDLL->bind(wine_get_build_id, "wine_get_build_id"); - NTDLL->bind(wine_get_host_version, "wine_get_host_version"); + NTDLL->bind_function(wine_get_version, "wine_get_version"); + NTDLL->bind_function(wine_get_build_id, "wine_get_build_id"); + NTDLL->bind_function(wine_get_host_version, "wine_get_host_version"); const char * wine_version = nullptr; const char * wine_build_id = nullptr; const char * wine_host_sysname = nullptr; Modified: trunk/OpenMPT/misc/mptWine.cpp ============================================================================== --- trunk/OpenMPT/misc/mptWine.cpp Fri Mar 14 15:21:58 2025 (r23024) +++ trunk/OpenMPT/misc/mptWine.cpp Fri Mar 14 15:49:35 2025 (r23025) @@ -61,11 +61,11 @@ { throw mpt::Wine::Exception("Could not load Wine kernel32.dll."); } - if(!(*m_Kernel32)->bind(wine_get_unix_file_name, "wine_get_unix_file_name")) + if(!(*m_Kernel32)->bind_function(wine_get_unix_file_name, "wine_get_unix_file_name")) { throw mpt::Wine::Exception("Could not bind Wine kernel32.dll:wine_get_unix_file_name."); } - if(!(*m_Kernel32)->bind(wine_get_dos_file_name, "wine_get_dos_file_name")) + if(!(*m_Kernel32)->bind_function(wine_get_dos_file_name, "wine_get_dos_file_name")) { throw mpt::Wine::Exception("Could not bind Wine kernel32.dll:wine_get_dos_file_name."); } Modified: trunk/OpenMPT/src/mpt/library/library.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:21:58 2025 (r23024) +++ trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:49:35 2025 (r23025) @@ -481,7 +481,7 @@ #endif template <typename Tfunc> - bool bind(Tfunc *& f, const std::string & symbol) const { + bool bind_function(Tfunc * & f, const std::string & symbol) const { #if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. @@ -495,6 +495,22 @@ } return (sym_ptr != nullptr); } + + template <typename Tdata> + bool bind_data(Tdata * & d, const std::string & symbol) const { +#if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) + // MinGW64 std::is_function is always false for non __cdecl functions. + // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. + static_assert(!std::is_function<Tdata>::value); +#endif + auto sym_ptr = get_address(symbol); + if constexpr (std::is_same<decltype(sym_ptr), void *>::value) { + d = static_cast<Tdata *>(sym_ptr); + } else { + d = reinterpret_cast<Tdata *>(sym_ptr); + } + return (sym_ptr != nullptr); + } }; |
|
From: <sv...@op...> - 2025-03-14 14:22:21
|
Author: manx Date: Fri Mar 14 15:21:58 2025 New Revision: 23024 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23024 Log: [Fix] mpt/library/library.hpp: Fix bind() on non-Windows. Broken since r22969. Modified: trunk/OpenMPT/src/mpt/library/library.hpp Modified: trunk/OpenMPT/src/mpt/library/library.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/library/library.hpp Wed Mar 12 19:15:00 2025 (r23023) +++ trunk/OpenMPT/src/mpt/library/library.hpp Fri Mar 14 15:21:58 2025 (r23024) @@ -488,7 +488,7 @@ static_assert(std::is_function<Tfunc>::value); #endif auto sym_ptr = get_address(symbol); - if constexpr (std::is_same<decltype(sym_ptr), void>::value) { + if constexpr (std::is_same<decltype(sym_ptr), void *>::value) { f = reinterpret_cast<Tfunc *>(sym_ptr); } else { f = mpt::function_pointer_cast<Tfunc *>(sym_ptr); |
|
From: <sv...@op...> - 2025-03-12 18:15:17
|
Author: manx Date: Wed Mar 12 19:15:00 2025 New Revision: 23023 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23023 Log: [Ref] mpt/base/detect_quirks.hpp: Add MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION. Modified: trunk/OpenMPT/misc/mptLibrary.h trunk/OpenMPT/src/mpt/base/detect_quirks.hpp trunk/OpenMPT/src/mpt/base/utility.hpp trunk/OpenMPT/src/mpt/library/library.hpp Modified: trunk/OpenMPT/misc/mptLibrary.h ============================================================================== --- trunk/OpenMPT/misc/mptLibrary.h Wed Mar 12 19:05:14 2025 (r23022) +++ trunk/OpenMPT/misc/mptLibrary.h Wed Mar 12 19:15:00 2025 (r23023) @@ -12,6 +12,7 @@ #include "openmpt/all/BuildSettings.hpp" +#include "mpt/base/detect.hpp" #include "mpt/base/utility.hpp" @@ -93,7 +94,7 @@ template <typename Tfunc> bool Bind(Tfunc * & f, const std::string &symbol) const { - #if !(MPT_OS_WINDOWS && MPT_COMPILER_GCC) + #if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // See https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug . static_assert(std::is_function<Tfunc>::value); Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Wed Mar 12 19:05:14 2025 (r23022) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Wed Mar 12 19:15:00 2025 (r23023) @@ -272,6 +272,12 @@ +#if MPT_OS_WINDOWS && MPT_LIBCXX_GNU +#define MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION +#endif + + + #if MPT_CXX_AT_LEAST(20) #if MPT_LIBCXX_GNU_BEFORE(10) || MPT_LIBCXX_LLVM_BEFORE(13000) || (MPT_LIBCXX_MS && MPT_MSVC_BEFORE(2022, 0)) || (MPT_LIBCXX_MS && !MPT_COMPILER_MSVC) #define MPT_LIBCXX_QUIRK_NO_CXX20_CONSTEXPR_ALGORITHM Modified: trunk/OpenMPT/src/mpt/base/utility.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/utility.hpp Wed Mar 12 19:05:14 2025 (r23022) +++ trunk/OpenMPT/src/mpt/base/utility.hpp Wed Mar 12 19:15:00 2025 (r23023) @@ -38,7 +38,7 @@ template <typename Tdst, typename Tsrc> MPT_CONSTEXPRINLINE Tdst function_pointer_cast(Tsrc f) { -#if !(MPT_OS_WINDOWS && MPT_COMPILER_GCC) +#if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. static_assert(std::is_pointer<typename std::remove_cv<Tsrc>::type>::value); Modified: trunk/OpenMPT/src/mpt/library/library.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/library/library.hpp Wed Mar 12 19:05:14 2025 (r23022) +++ trunk/OpenMPT/src/mpt/library/library.hpp Wed Mar 12 19:15:00 2025 (r23023) @@ -482,7 +482,7 @@ template <typename Tfunc> bool bind(Tfunc *& f, const std::string & symbol) const { -#if !(MPT_OS_WINDOWS && MPT_COMPILER_GCC) +#if !defined(MPT_LIBCXX_QUIRK_INCOMPLETE_IS_FUNCTION) // MinGW64 std::is_function is always false for non __cdecl functions. // Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>. static_assert(std::is_function<Tfunc>::value); |
|
From: <sv...@op...> - 2025-03-12 18:05:22
|
Author: manx Date: Wed Mar 12 19:05:14 2025 New Revision: 23022 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23022 Log: [Ref] mptPathString: Small step towards header-only. Modified: trunk/OpenMPT/common/mptPathString.cpp trunk/OpenMPT/common/mptPathString.h Modified: trunk/OpenMPT/common/mptPathString.cpp ============================================================================== --- trunk/OpenMPT/common/mptPathString.cpp Mon Mar 10 15:46:30 2025 (r23021) +++ trunk/OpenMPT/common/mptPathString.cpp Wed Mar 12 19:05:14 2025 (r23022) @@ -16,10 +16,6 @@ #include <tchar.h> #endif -#if defined(MODPLUG_TRACKER) && MPT_OS_WINDOWS -#include <windows.h> -#endif - OPENMPT_NAMESPACE_BEGIN @@ -33,17 +29,6 @@ -#if !MPT_OS_WINDOWS_WINRT - -int PathCompareNoCase(const PathString & a, const PathString & b) -{ - return lstrcmpi(a.AsNative().c_str(), b.AsNative().c_str()); -} - -#endif // !MPT_OS_WINDOWS_WINRT - - - // Convert an absolute path to a path that's relative to "&relativeTo". mpt::PathString AbsolutePathToRelative(const mpt::PathString &path, const mpt::PathString &relativeTo) { Modified: trunk/OpenMPT/common/mptPathString.h ============================================================================== --- trunk/OpenMPT/common/mptPathString.h Mon Mar 10 15:46:30 2025 (r23021) +++ trunk/OpenMPT/common/mptPathString.h Wed Mar 12 19:05:14 2025 (r23022) @@ -25,6 +25,10 @@ #include "mptString.h" +#if defined(MODPLUG_TRACKER) && MPT_OS_WINDOWS +#include <windows.h> +#endif + OPENMPT_NAMESPACE_BEGIN @@ -92,7 +96,10 @@ #if !MPT_OS_WINDOWS_WINRT -int PathCompareNoCase(const PathString &a, const PathString &b); +inline int PathCompareNoCase(const PathString &a, const PathString &b) +{ + return lstrcmpi(a.AsNative().c_str(), b.AsNative().c_str()); +} #endif // !MPT_OS_WINDOWS_WINRT |
3 messages has been excluded from this view by a project administrator.
