Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(121) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-08-30 08:23:28
|
Author: manx Date: Fri Aug 30 10:23:15 2024 New Revision: 21540 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21540 Log: [Ref] Makefile: Remove redundant options for 3rd party libraries. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Aug 30 09:38:16 2024 (r21539) +++ trunk/OpenMPT/Makefile Fri Aug 30 10:23:15 2024 (r21540) @@ -664,7 +664,6 @@ LOCAL_ZLIB_SOURCES += include/zlib/uncompr.c LOCAL_ZLIB_SOURCES += include/zlib/zutil.c include/zlib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H -include/zlib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DSTDC -DZ_HAVE_UNISTD_H else ifeq ($(NO_ZLIB),1) else @@ -725,13 +724,9 @@ ALL_OBJECTS += $(MPG123_OBJECTS) ALL_DEPENDS += $(MPG123_DEPENDS) include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) LOCAL_MPG123_SOURCES := LOCAL_MPG123_SOURCES += LOCAL_MPG123_OBJECTS := @@ -785,13 +780,9 @@ LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) -include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS) endif @@ -824,7 +815,6 @@ LOCAL_OGG_SOURCES += include/ogg/src/bitwise.c LOCAL_OGG_SOURCES += include/ogg/src/framing.c include/ogg/src/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/ogg/src/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_OGG),1) else @@ -877,7 +867,6 @@ LOCAL_VORBIS_SOURCES += include/vorbis/lib/vorbisfile.c LOCAL_VORBIS_SOURCES += include/vorbis/lib/window.c include/vorbis/lib/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -include/vorbis/lib/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) else ifeq ($(NO_VORBIS),1) else |
|
From: <sv...@op...> - 2024-08-30 07:38:28
|
Author: manx Date: Fri Aug 30 09:38:16 2024 New Revision: 21539 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21539 Log: [New] build: CI: GitHub: Add RHEL8 and RHEL9. Added: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Added: trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/RHEL-Autotools.yml Fri Aug 30 09:38:16 2024 (r21539) @@ -0,0 +1,38 @@ +name: RHEL Autotools + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { version: 'almalinux:8' } + - { version: 'almalinux:9' } + - { version: 'rockylinux:8' } + - { version: 'rockylinux:9' } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools + cancel-in-progress: true + + runs-on: ubuntu-latest + container: + image: ${{matrix.version}} + + steps: + - name: Install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) + - name: Build + run: export MAKEFLAGS=-j$(nproc); ./build/autotools/autoconfiscate.sh Added: trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/RHEL-Makefile.yml Fri Aug 30 09:38:16 2024 (r21539) @@ -0,0 +1,48 @@ +name: RHEL Makefile + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { version: 'almalinux:8' , deps: sys } + - { version: 'almalinux:8' , deps: local } + - { version: 'almalinux:8' , deps: small } + - { version: 'almalinux:9' , deps: sys } + - { version: 'almalinux:9' , deps: local } + - { version: 'almalinux:9' , deps: small } + - { version: 'rockylinux:8', deps: sys } + - { version: 'rockylinux:8', deps: local } + - { version: 'rockylinux:8', deps: small } + - { version: 'rockylinux:9', deps: sys } + - { version: 'rockylinux:9', deps: local } + - { version: 'rockylinux:9', deps: small } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + cancel-in-progress: true + + runs-on: ubuntu-latest + container: + image: ${{matrix.version}} + + steps: + - name: Install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) + - name: Build + run: make -j$(nproc) 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 + run: make -j$(nproc) 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 |
|
From: <sv...@op...> - 2024-08-30 06:21:17
|
Author: manx Date: Fri Aug 30 08:21:01 2024 New Revision: 21538 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21538 Log: Merged revision(s) 21521 from trunk/OpenMPT: [Fix] build: Makefile: Emscripten: Remove redundant -c option. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/build/make/config-emscripten.mk Modified: branches/OpenMPT-1.29/build/make/config-emscripten.mk ============================================================================== --- branches/OpenMPT-1.29/build/make/config-emscripten.mk Fri Aug 30 08:06:00 2024 (r21537) +++ branches/OpenMPT-1.29/build/make/config-emscripten.mk Fri Aug 30 08:21:01 2024 (r21538) @@ -1,6 +1,6 @@ -CC = emcc -c -CXX = em++ -c +CC = emcc +CXX = em++ LD = em++ AR = emar LINK.cc = em++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) |
|
From: <sv...@op...> - 2024-08-30 06:06:10
|
Author: manx Date: Fri Aug 30 08:06:00 2024 New Revision: 21537 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21537 Log: Merged revision(s) 21521 from trunk/OpenMPT: [Fix] build: Makefile: Emscripten: Remove redundant -c option. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/build/make/config-emscripten.mk Modified: branches/OpenMPT-1.30/build/make/config-emscripten.mk ============================================================================== --- branches/OpenMPT-1.30/build/make/config-emscripten.mk Thu Aug 29 21:33:57 2024 (r21536) +++ branches/OpenMPT-1.30/build/make/config-emscripten.mk Fri Aug 30 08:06:00 2024 (r21537) @@ -1,9 +1,9 @@ ifeq ($(origin CC),default) -CC = emcc -c +CC = emcc endif ifeq ($(origin CXX),default) -CXX = em++ -c +CXX = em++ endif ifeq ($(origin LD),default) LD = em++ |
|
From: <sv...@op...> - 2024-08-29 22:03:15
|
Author: sagamusix Date: Thu Aug 29 21:33:57 2024 New Revision: 21536 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21536 Log: Merged revision(s) 21535 from trunk/OpenMPT: [Fix] SFZ: Reallocate sample data if it was trimmed excessively by "offset" and "end" opcodes. This is crucial for SFZs like those generated by Sforzando's SF2 conversion process, as the whole SF2 sample data chunk ends up in a single WAV file that is then referenced by each region and sliced accordingly. Note that such files still take an excessively long amount of time to load if the original SF2 was huge and instruments contained many regions, but at least you no longer run out of memory when doing so. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp Modified: branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp Thu Aug 29 21:33:38 2024 (r21535) +++ branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp Thu Aug 29 21:33:57 2024 (r21536) @@ -988,6 +988,8 @@ filenameModifier += P_(" (cross-fade)"); } + const SmpLength origSampleLength = sample.nLength; + // Sample offset if(region.offset && region.offset < sample.nLength) { @@ -1003,6 +1005,19 @@ } LimitMax(sample.nLength, region.end); + if(sample.nLength < origSampleLength && (origSampleLength - sample.nLength) >= 128 * 1024) + { + // If the sample was trimmed excessively, re-allocate to save memory. + // This is crucial for SFZs like those generated by Sforzando's SF2 conversion process, + // as the whole SF2 sample data chunk ends up in a single WAV file that is then referenced by each region and sliced accordingly. + if(auto newData = ModSample::AllocateSample(sample.nLength, sample.GetBytesPerSample())) + { + memcpy(newData, sample.samplev(), sample.nLength * sample.GetBytesPerSample()); + sample.FreeSample(); + sample.pData.pSample = newData; + } + } + if(region.invertPhase) { ctrlSmp::InvertSample(sample, 0, sample.nLength, *this); |
|
From: <sv...@op...> - 2024-08-29 22:03:10
|
Author: sagamusix Date: Thu Aug 29 21:33:38 2024 New Revision: 21535 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21535 Log: [Fix] SFZ: Reallocate sample data if it was trimmed excessively by "offset" and "end" opcodes. This is crucial for SFZs like those generated by Sforzando's SF2 conversion process, as the whole SF2 sample data chunk ends up in a single WAV file that is then referenced by each region and sliced accordingly. Note that such files still take an excessively long amount of time to load if the original SF2 was huge and instruments contained many regions, but at least you no longer run out of memory when doing so. Modified: trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp Modified: trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp Thu Aug 29 17:44:00 2024 (r21534) +++ trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp Thu Aug 29 21:33:38 2024 (r21535) @@ -997,6 +997,8 @@ filenameModifier += P_(" (cross-fade)"); } + const SmpLength origSampleLength = sample.nLength; + // Sample offset if(region.offset && region.offset < sample.nLength) { @@ -1012,6 +1014,19 @@ } LimitMax(sample.nLength, region.end); + if(sample.nLength < origSampleLength && (origSampleLength - sample.nLength) >= 128 * 1024) + { + // If the sample was trimmed excessively, re-allocate to save memory. + // This is crucial for SFZs like those generated by Sforzando's SF2 conversion process, + // as the whole SF2 sample data chunk ends up in a single WAV file that is then referenced by each region and sliced accordingly. + if(auto newData = ModSample::AllocateSample(sample.nLength, sample.GetBytesPerSample())) + { + memcpy(newData, sample.samplev(), sample.nLength * sample.GetBytesPerSample()); + sample.FreeSample(); + sample.pData.pSample = newData; + } + } + if(region.invertPhase) { ctrlSmp::InvertSample(sample, 0, sample.nLength, *this); |
|
From: <sv...@op...> - 2024-08-29 15:44:12
|
Author: manx Date: Thu Aug 29 17:44:00 2024 New Revision: 21534 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21534 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/random/random.hpp Modified: trunk/OpenMPT/src/mpt/random/random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/random.hpp Thu Aug 29 17:37:00 2024 (r21533) +++ trunk/OpenMPT/src/mpt/random/random.hpp Thu Aug 29 17:44:00 2024 (r21534) @@ -104,13 +104,13 @@ #if MPT_COMPILER_MSVC #pragma warning(push) #pragma warning(disable : 4018) // '<': signed/unsigned mismatch -#endif // MPT_COMPILER_MSVC +#endif // MPT_COMPILER_MSVC static_assert(std::numeric_limits<T>::is_integer); - if constexpr(std::is_same<T, uint8>::value) { + if constexpr (std::is_same<T, uint8>::value) { using dis_type = std::uniform_int_distribution<unsigned int>; dis_type dis(min, max); return static_cast<T>(dis(rng)); - } else if constexpr(std::is_same<T, int8>::value) { + } else if constexpr (std::is_same<T, int8>::value) { using dis_type = std::uniform_int_distribution<int>; dis_type dis(min, max); return static_cast<T>(dis(rng)); |
|
From: <sv...@op...> - 2024-08-29 15:37:09
|
Author: manx Date: Thu Aug 29 17:37:00 2024 New Revision: 21533 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21533 Log: [Ref] openmpt123: Use mpt/random. Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-openmpt123.lua Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/premake/mpt-openmpt123.lua Thu Aug 29 17:37:00 2024 (r21533) @@ -34,6 +34,7 @@ "../../src/mpt/io_file/*.hpp", "../../src/mpt/parse/*.hpp", "../../src/mpt/path/*.hpp", + "../../src/mpt/random/*.hpp", "../../src/mpt/string/*.hpp", "../../src/mpt/string_transcode/*.hpp", "../../openmpt123/*.cpp", Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -820,6 +820,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -306,6 +309,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -820,6 +820,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -306,6 +309,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1537,6 +1537,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win10/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -817,6 +817,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1177,6 +1177,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win8/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1177,6 +1177,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2019win81/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1595,6 +1595,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1513,6 +1513,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -837,6 +837,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1207,6 +1207,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Thu Aug 29 17:37:00 2024 (r21533) @@ -1207,6 +1207,14 @@ <ClInclude Include="..\..\src\mpt\path\os_path.hpp" /> <ClInclude Include="..\..\src\mpt\path\os_path_long.hpp" /> <ClInclude Include="..\..\src\mpt\path\path.hpp" /> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\crand.hpp" /> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp" /> + <ClInclude Include="..\..\src\mpt\random\device.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine.hpp" /> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp" /> + <ClInclude Include="..\..\src\mpt\random\random.hpp" /> + <ClInclude Include="..\..\src\mpt\random\seed.hpp" /> <ClInclude Include="..\..\src\mpt\string\buffer.hpp" /> <ClInclude Include="..\..\src\mpt\string\types.hpp" /> <ClInclude Include="..\..\src\mpt\string\utility.hpp" /> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Thu Aug 29 17:37:00 2024 (r21533) @@ -43,6 +43,9 @@ <Filter Include="src\mpt\path"> <UniqueIdentifier>{4984D703-35E7-66A8-DE6C-9F5ECAAE322B}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\random"> + <UniqueIdentifier>{3DBF705C-298D-6462-1221-D588FE8D40C7}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\string"> <UniqueIdentifier>{13002060-FFCD-1366-E861-848CD4CEEFCA}</UniqueIdentifier> </Filter> @@ -312,6 +315,30 @@ <ClInclude Include="..\..\src\mpt\path\path.hpp"> <Filter>src\mpt\path</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\random\any_engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\crand.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\default_engines.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\device.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\engine_lcg.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\random.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> + <ClInclude Include="..\..\src\mpt\random\seed.hpp"> + <Filter>src\mpt\random</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\string\buffer.hpp"> <Filter>src\mpt\string</Filter> </ClInclude> Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Thu Aug 29 17:28:57 2024 (r21532) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Thu Aug 29 17:37:00 2024 (r21533) @@ -44,6 +44,11 @@ #include "mpt/base/check_platform.hpp" #include "mpt/base/detect.hpp" +#include "mpt/random/crand.hpp" +#include "mpt/random/default_engines.hpp" +#include "mpt/random/device.hpp" +#include "mpt/random/engine.hpp" + #include <algorithm> #include <deque> #include <fstream> @@ -54,7 +59,6 @@ #include <map> #include <memory> #include <optional> -#include <random> #include <set> #include <sstream> #include <stdexcept> @@ -67,7 +71,6 @@ #include <cstdio> #include <cstdlib> #include <cstring> -#include <ctime> #if MPT_OS_DJGPP #include <conio.h> @@ -1635,15 +1638,15 @@ } -static mpt::native_path get_random_filename( std::set<mpt::native_path> & filenames, std::default_random_engine & prng ) { - std::size_t index = std::uniform_int_distribution<std::size_t>( 0, filenames.size() - 1 )( prng ); +static mpt::native_path get_random_filename( std::set<mpt::native_path> & filenames, mpt::good_engine & prng ) { + std::size_t index = mpt::random<std::size_t>( prng, 0, filenames.size() - 1 ); std::set<mpt::native_path>::iterator it = filenames.begin(); std::advance( it, index ); return *it; } -static void render_files( commandlineflags & flags, textout & log, write_buffers_interface & audio_stream, std::default_random_engine & prng ) { +static void render_files( commandlineflags & flags, textout & log, write_buffers_interface & audio_stream, mpt::good_engine & prng ) { if ( flags.randomize ) { std::shuffle( flags.filenames.begin(), flags.filenames.end(), prng ); } @@ -2359,16 +2362,9 @@ log.writeout(); - std::default_random_engine prng; - try { - std::random_device rd; - std::seed_seq seq{ rd(), static_cast<unsigned int>( std::time( NULL ) ) }; - prng = std::default_random_engine{ seq }; - } catch ( const std::exception & ) { - std::seed_seq seq{ static_cast<unsigned int>( std::time( NULL ) ) }; - prng = std::default_random_engine{ seq }; - } - std::srand( std::uniform_int_distribution<unsigned int>()( prng ) ); + mpt::sane_random_device rd; + mpt::good_engine prng = mpt::make_prng<mpt::good_engine>( rd ); + mpt::crand::reseed( prng ); switch ( flags.mode ) { case Mode::Probe: { |
|
From: <sv...@op...> - 2024-08-29 15:29:04
|
Author: manx Date: Thu Aug 29 17:28:57 2024 New Revision: 21532 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21532 Log: [Ref] mpt/random/random.hpp: Add mpt::random<T>(prng, min, max) for integers. Modified: trunk/OpenMPT/src/mpt/random/random.hpp trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Modified: trunk/OpenMPT/src/mpt/random/random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/random.hpp Thu Aug 29 17:04:30 2024 (r21531) +++ trunk/OpenMPT/src/mpt/random/random.hpp Thu Aug 29 17:28:57 2024 (r21532) @@ -5,6 +5,7 @@ +#include "mpt/base/detect.hpp" #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" @@ -98,10 +99,36 @@ }; -template <typename T, typename Trng> +template <typename T, typename Trng, typename std::enable_if<std::is_integral<T>::value, bool>::type = true> +inline T random(Trng & rng, T min, T max) { +#if MPT_COMPILER_MSVC +#pragma warning(push) +#pragma warning(disable : 4018) // '<': signed/unsigned mismatch +#endif // MPT_COMPILER_MSVC + static_assert(std::numeric_limits<T>::is_integer); + if constexpr(std::is_same<T, uint8>::value) { + using dis_type = std::uniform_int_distribution<unsigned int>; + dis_type dis(min, max); + return static_cast<T>(dis(rng)); + } else if constexpr(std::is_same<T, int8>::value) { + using dis_type = std::uniform_int_distribution<int>; + dis_type dis(min, max); + return static_cast<T>(dis(rng)); + } else { + using dis_type = std::uniform_int_distribution<T>; + dis_type dis(min, max); + return static_cast<T>(dis(rng)); + } +#if MPT_COMPILER_MSVC +#pragma warning(pop) +#endif // MPT_COMPILER_MSVC +} + + +template <typename T, typename Trng, typename std::enable_if<std::is_floating_point<T>::value, bool>::type = true> inline T random(Trng & rng, T min, T max) { static_assert(!std::numeric_limits<T>::is_integer); - typedef mpt::uniform_real_distribution<T> dis_type; + using dis_type = mpt::uniform_real_distribution<T>; dis_type dis(min, max); return static_cast<T>(dis(rng)); } Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Thu Aug 29 17:04:30 2024 (r21531) +++ trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Thu Aug 29 17:28:57 2024 (r21532) @@ -64,6 +64,11 @@ failed = failed || !mpt::is_in_range(mpt::random<int16>(prng, 9), 0, 511); failed = failed || !mpt::is_in_range(mpt::random<int64>(prng, 1), 0, 1); + failed = failed || !mpt::is_in_range(mpt::random<int8>(prng, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int16>(prng, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int32>(prng, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int64>(prng, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<float>(prng, 0.0f, 1.0f), 0.0f, 1.0f); failed = failed || !mpt::is_in_range(mpt::random<double>(prng, 0.0, 1.0), 0.0, 1.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng, -1.0, 1.0), -1.0, 1.0); @@ -92,6 +97,11 @@ failed = failed || !mpt::is_in_range(mpt::random<int16>(prng64, 9), 0, 511); failed = failed || !mpt::is_in_range(mpt::random<int64>(prng64, 1), 0, 1); + failed = failed || !mpt::is_in_range(mpt::random<int8>(prng64, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int16>(prng64, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int32>(prng64, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int64>(prng64, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<float>(prng64, 0.0f, 1.0f), 0.0f, 1.0f); failed = failed || !mpt::is_in_range(mpt::random<double>(prng64, 0.0, 1.0), 0.0, 1.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng64, -1.0, 1.0), -1.0, 1.0); @@ -120,6 +130,11 @@ failed = failed || !mpt::is_in_range(mpt::random<int16>(prng8, 9), 0, 511); failed = failed || !mpt::is_in_range(mpt::random<int64>(prng8, 1), 0, 1); + failed = failed || !mpt::is_in_range(mpt::random<int8>(prng8, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int16>(prng8, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int32>(prng8, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<int64>(prng8, -42, 69), -42, 69); + failed = failed || !mpt::is_in_range(mpt::random<float>(prng8, 0.0f, 1.0f), 0.0f, 1.0f); failed = failed || !mpt::is_in_range(mpt::random<double>(prng8, 0.0, 1.0), 0.0, 1.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng8, -1.0, 1.0), -1.0, 1.0); |
|
From: <sv...@op...> - 2024-08-29 15:04:37
|
Author: manx Date: Thu Aug 29 17:04:30 2024 New Revision: 21531 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21531 Log: Merged revision(s) 21529 from trunk/OpenMPT: [Fix] mpt/random/random.hpp: Add missing includes. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/random/random.hpp Modified: branches/OpenMPT-1.30/src/mpt/random/random.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/random/random.hpp Thu Aug 29 17:04:08 2024 (r21530) +++ branches/OpenMPT-1.30/src/mpt/random/random.hpp Thu Aug 29 17:04:30 2024 (r21531) @@ -8,8 +8,11 @@ #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" +#include <limits> #include <type_traits> +#include <cstddef> + namespace mpt { inline namespace MPT_INLINE_NS { |
|
From: <sv...@op...> - 2024-08-29 15:04:20
|
Author: manx Date: Thu Aug 29 17:04:08 2024 New Revision: 21530 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21530 Log: Merged revision(s) 21529 from trunk/OpenMPT: [Fix] mpt/random/random.hpp: Add missing includes. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/random/random.hpp Modified: branches/OpenMPT-1.31/src/mpt/random/random.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/random/random.hpp Thu Aug 29 17:03:38 2024 (r21529) +++ branches/OpenMPT-1.31/src/mpt/random/random.hpp Thu Aug 29 17:04:08 2024 (r21530) @@ -8,8 +8,11 @@ #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" +#include <limits> #include <type_traits> +#include <cstddef> + namespace mpt { inline namespace MPT_INLINE_NS { |
|
From: <sv...@op...> - 2024-08-29 15:03:52
|
Author: manx Date: Thu Aug 29 17:03:38 2024 New Revision: 21529 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21529 Log: [Fix] mpt/random/random.hpp: Add missing includes. Modified: trunk/OpenMPT/src/mpt/random/random.hpp Modified: trunk/OpenMPT/src/mpt/random/random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/random.hpp Mon Aug 26 21:52:18 2024 (r21528) +++ trunk/OpenMPT/src/mpt/random/random.hpp Thu Aug 29 17:03:38 2024 (r21529) @@ -8,8 +8,11 @@ #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" +#include <limits> #include <type_traits> +#include <cstddef> + namespace mpt { inline namespace MPT_INLINE_NS { |
|
From: <sv...@op...> - 2024-08-26 19:52:46
|
Author: sagamusix Date: Mon Aug 26 21:52:18 2024 New Revision: 21528 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21528 Log: [Imp] Test: Add test data for extended IT instruments (referencing sample ID > 255). Modified: trunk/OpenMPT/test/test.cpp trunk/OpenMPT/test/test.mptm Modified: trunk/OpenMPT/test/test.cpp ============================================================================== --- trunk/OpenMPT/test/test.cpp Mon Aug 26 19:52:07 2024 (r21527) +++ trunk/OpenMPT/test/test.cpp Mon Aug 26 21:52:18 2024 (r21528) @@ -3129,7 +3129,7 @@ for(size_t i = 0; i < NOTE_MAX; i++) { - VERIFY_EQUAL_NONCONT(pIns->Keyboard[i], (i == NOTE_MIDDLEC - 1) ? 99 : 1); + VERIFY_EQUAL_NONCONT(pIns->Keyboard[i], (i == NOTE_MIDDLEC - 1) ? (ins * 1111) : 1); VERIFY_EQUAL_NONCONT(pIns->NoteMap[i], (i == NOTE_MIDDLEC - 1) ? (i + 13) : (i + 1)); } Modified: trunk/OpenMPT/test/test.mptm ============================================================================== Binary file (source and/or target). No diff available. |
|
From: <sv...@op...> - 2024-08-26 17:52:14
|
Author: sagamusix Date: Mon Aug 26 19:52:07 2024 New Revision: 21527 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21527 Log: Merged revision(s) 21526 from trunk/OpenMPT: [Fix] Add missing credits. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/common/version.cpp Modified: branches/OpenMPT-1.31/common/version.cpp ============================================================================== --- branches/OpenMPT-1.31/common/version.cpp Mon Aug 26 19:51:49 2024 (r21526) +++ branches/OpenMPT-1.31/common/version.cpp Mon Aug 26 19:52:07 2024 (r21527) @@ -615,9 +615,11 @@ "\n" "Additional contributors:\n" "coda (https://coda.s3m.us/)\n" + "cs127 (https://cs127.github.io/)\n" "Jo\xC3\xA3o Baptista de Paula e Silva (https://joaobapt.com/)\n" "kode54 (https://kode54.net/)\n" "Revenant (https://revenant1.net/)\n" + "SYRiNX\n" "xaimus (http://xaimus.com/)\n" "\n" "Thanks to:\n" |
|
From: <sv...@op...> - 2024-08-26 17:51:56
|
Author: sagamusix Date: Mon Aug 26 19:51:49 2024 New Revision: 21526 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21526 Log: [Fix] Add missing credits. Modified: trunk/OpenMPT/common/version.cpp Modified: trunk/OpenMPT/common/version.cpp ============================================================================== --- trunk/OpenMPT/common/version.cpp Mon Aug 26 19:46:43 2024 (r21525) +++ trunk/OpenMPT/common/version.cpp Mon Aug 26 19:51:49 2024 (r21526) @@ -615,9 +615,11 @@ "\n" "Additional contributors:\n" "coda (https://coda.s3m.us/)\n" + "cs127 (https://cs127.github.io/)\n" "Jo\xC3\xA3o Baptista de Paula e Silva (https://joaobapt.com/)\n" "kode54 (https://kode54.net/)\n" "Revenant (https://revenant1.net/)\n" + "SYRiNX\n" "xaimus (http://xaimus.com/)\n" "\n" "Thanks to:\n" |
|
From: <sv...@op...> - 2024-08-26 17:46:51
|
Author: sagamusix Date: Mon Aug 26 19:46:43 2024 New Revision: 21525 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21525 Log: [Fix] VST: Shell plugin instrument flag was not updated if the shell itself didn't report to be an instrument plugin (e.g. Waves instruments). Modified: trunk/OpenMPT/mptrack/Vstplug.cpp Modified: trunk/OpenMPT/mptrack/Vstplug.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Vstplug.cpp Sun Aug 25 23:41:32 2024 (r21524) +++ trunk/OpenMPT/mptrack/Vstplug.cpp Mon Aug 26 19:46:43 2024 (r21525) @@ -317,7 +317,8 @@ vendor.back() = '\0'; plugin.vendor = mpt::ToCString(mpt::Charset::Locale, vendor.data()); - if(CVstPlugin::IsInstrument(*loadResult.effect)) + plugin.isInstrument = CVstPlugin::IsInstrument(*loadResult.effect); + if(plugin.isInstrument) plugin.category = PluginCategory::Synth; else plugin.category = static_cast<PluginCategory>(DispatchSEH(maskCrashes, *loadResult.effect, Vst::effGetPlugCategory, 0, 0, nullptr, 0.0f, exception)); |
|
From: <sv...@op...> - 2024-08-25 21:41:44
|
Author: sagamusix Date: Sun Aug 25 23:41:32 2024 New Revision: 21524 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21524 Log: Merged revision(s) 21523 from trunk/OpenMPT: [Fix] IPC: Selecting the last used OpenMPT instance didn't work with the "simple" FindIPCWindow overload. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/IPCWindow.cpp branches/OpenMPT-1.31/mptrack/IPCWindow.h Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/IPCWindow.cpp Sun Aug 25 23:40:30 2024 (r21523) +++ branches/OpenMPT-1.31/mptrack/IPCWindow.cpp Sun Aug 25 23:41:32 2024 (r21524) @@ -143,11 +143,6 @@ return ::SendMessage(ipcWnd, WM_COPYDATA, 0, reinterpret_cast<LPARAM>(©Data)); } - HWND FindIPCWindow() - { - return ::FindWindow(ClassName, nullptr); - } - struct EnumWindowState { uintptr_t lastActive = 0; @@ -218,8 +213,6 @@ return state.result; } - - bool SendToIPC(const std::vector<mpt::PathString> &filenames) { HWND ipcWnd = FindIPCWindow(); Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/IPCWindow.h Sun Aug 25 23:40:30 2024 (r21523) +++ branches/OpenMPT-1.31/mptrack/IPCWindow.h Sun Aug 25 23:41:32 2024 (r21524) @@ -38,16 +38,15 @@ enum InstanceRequirements { + None = 0x00u, SamePath = 0x01u, SameSettings = 0x02u, SameArchitecture = 0x04u, - SameVersion = 0x08u + SameVersion = 0x08u, }; MPT_DECLARE_ENUM(InstanceRequirements) - HWND FindIPCWindow(); - - HWND FindIPCWindow(FlagSet<InstanceRequirements> require); + HWND FindIPCWindow(FlagSet<InstanceRequirements> require = None); // Send file open requests to other OpenMPT instance, if there is one bool SendToIPC(const std::vector<mpt::PathString> &filenames); |
|
From: <sv...@op...> - 2024-08-25 21:40:42
|
Author: sagamusix Date: Sun Aug 25 23:40:30 2024 New Revision: 21523 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21523 Log: [Fix] IPC: Selecting the last used OpenMPT instance didn't work with the "simple" FindIPCWindow overload. Modified: trunk/OpenMPT/mptrack/IPCWindow.cpp trunk/OpenMPT/mptrack/IPCWindow.h Modified: trunk/OpenMPT/mptrack/IPCWindow.cpp ============================================================================== --- trunk/OpenMPT/mptrack/IPCWindow.cpp Sun Aug 25 15:58:45 2024 (r21522) +++ trunk/OpenMPT/mptrack/IPCWindow.cpp Sun Aug 25 23:40:30 2024 (r21523) @@ -152,11 +152,6 @@ return ::SendMessage(ipcWnd, WM_COPYDATA, 0, reinterpret_cast<LPARAM>(©Data)); } - HWND FindIPCWindow() - { - return ::FindWindow(ClassName, nullptr); - } - struct EnumWindowState { uintptr_t lastActive = 0; @@ -227,8 +222,6 @@ return state.result; } - - bool SendToIPC(const std::vector<mpt::PathString> &filenames, bool autoplay) { HWND ipcWnd = FindIPCWindow(); Modified: trunk/OpenMPT/mptrack/IPCWindow.h ============================================================================== --- trunk/OpenMPT/mptrack/IPCWindow.h Sun Aug 25 15:58:45 2024 (r21522) +++ trunk/OpenMPT/mptrack/IPCWindow.h Sun Aug 25 23:40:30 2024 (r21523) @@ -39,16 +39,15 @@ enum InstanceRequirements { + None = 0x00u, SamePath = 0x01u, SameSettings = 0x02u, SameArchitecture = 0x04u, - SameVersion = 0x08u + SameVersion = 0x08u, }; MPT_DECLARE_ENUM(InstanceRequirements) - HWND FindIPCWindow(); - - HWND FindIPCWindow(FlagSet<InstanceRequirements> require); + HWND FindIPCWindow(FlagSet<InstanceRequirements> require = None); // Send file open requests to other OpenMPT instance, if there is one bool SendToIPC(const std::vector<mpt::PathString> &filenames, bool autoplay); |
|
From: <sv...@op...> - 2024-08-25 13:58:56
|
Author: manx Date: Sun Aug 25 15:58:45 2024 New Revision: 21522 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21522 Log: Merged revision(s) 21521 from trunk/OpenMPT: [Fix] build: Makefile: Emscripten: Remove redundant -c option. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/config-emscripten.mk Modified: branches/OpenMPT-1.31/build/make/config-emscripten.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-emscripten.mk Sun Aug 25 14:42:15 2024 (r21521) +++ branches/OpenMPT-1.31/build/make/config-emscripten.mk Sun Aug 25 15:58:45 2024 (r21522) @@ -1,9 +1,9 @@ ifeq ($(origin CC),default) -CC = emcc -c +CC = emcc endif ifeq ($(origin CXX),default) -CXX = em++ -c +CXX = em++ endif ifeq ($(origin LD),default) LD = em++ |
|
From: <sv...@op...> - 2024-08-25 12:42:28
|
Author: manx Date: Sun Aug 25 14:42:15 2024 New Revision: 21521 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21521 Log: [Fix] build: Makefile: Emscripten: Remove redundant -c option. Modified: trunk/OpenMPT/build/make/config-emscripten.mk Modified: trunk/OpenMPT/build/make/config-emscripten.mk ============================================================================== --- trunk/OpenMPT/build/make/config-emscripten.mk Sun Aug 25 13:04:32 2024 (r21520) +++ trunk/OpenMPT/build/make/config-emscripten.mk Sun Aug 25 14:42:15 2024 (r21521) @@ -1,9 +1,9 @@ ifeq ($(origin CC),default) -CC = emcc -c +CC = emcc endif ifeq ($(origin CXX),default) -CXX = em++ -c +CXX = em++ endif ifeq ($(origin LD),default) LD = em++ |
|
From: <sv...@op...> - 2024-08-25 11:04:48
|
Author: manx Date: Sun Aug 25 13:04:32 2024 New Revision: 21520 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21520 Log: Merged revision(s) 21519 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Apple never released XCode 16.0, and instead replaced XCode 16.0 Beta by XCode 16.1 Beta. GitHub does not provide 16.0 Beta anymore, so switch to 16.1 Beta. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sun Aug 25 13:04:04 2024 (r21519) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sun Aug 25 13:04:32 2024 (r21520) @@ -10,7 +10,7 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '16.0' } + - { host: macos-14, compiler: '16.1' } - { host: macos-14, compiler: '15.4' } - { host: macos-14, compiler: '15.3' } - { host: macos-13, compiler: '15.2' } Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sun Aug 25 13:04:04 2024 (r21519) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sun Aug 25 13:04:32 2024 (r21520) @@ -11,22 +11,22 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '16.0', arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: '' , target: '' , deps: sys , check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: '' , target: '' , deps: sys , check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '' , deps: local, check: true , ancient: false } |
|
From: <sv...@op...> - 2024-08-25 11:04:13
|
Author: manx Date: Sun Aug 25 13:04:04 2024 New Revision: 21519 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21519 Log: [Fix] build: CI: GitHub: macOS: Apple never released XCode 16.0, and instead replaced XCode 16.0 Beta by XCode 16.1 Beta. GitHub does not provide 16.0 Beta anymore, so switch to 16.1 Beta. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sun Aug 18 19:52:33 2024 (r21518) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sun Aug 25 13:04:04 2024 (r21519) @@ -12,7 +12,7 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '16.0' } + - { host: macos-14, compiler: '16.1' } - { host: macos-14, compiler: '15.4' } - { host: macos-14, compiler: '15.3' } - { host: macos-13, compiler: '15.2' } Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sun Aug 18 19:52:33 2024 (r21518) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sun Aug 25 13:04:04 2024 (r21519) @@ -13,22 +13,22 @@ fail-fast: false matrix: include: - - { host: macos-14, compiler: '16.0', arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: '' , target: '' , deps: sys , check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: '' , target: '' , deps: sys , check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '' , deps: local, check: true , ancient: false } |
|
From: <sv...@op...> - 2024-08-18 17:52:46
|
Author: manx Date: Sun Aug 18 19:52:33 2024 New Revision: 21518 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21518 Log: [Var] Update .gitignore. Modified: trunk/OpenMPT/.gitignore Modified: trunk/OpenMPT/.gitignore ============================================================================== --- trunk/OpenMPT/.gitignore Sun Aug 18 13:04:16 2024 (r21517) +++ trunk/OpenMPT/.gitignore Sun Aug 18 19:52:33 2024 (r21518) @@ -904,6 +904,7 @@ /soundlib/plugins/dmo/*.o /src/openmpt/sounddevice/*.d /src/openmpt/sounddevice/*.o +/src/openmpt/soundfile_write/*.d /test/*.d /test/*.o /test/test.saved.mptm |
|
From: <sv...@op...> - 2024-08-18 11:04:27
|
Author: manx Date: Sun Aug 18 13:04:16 2024 New Revision: 21517 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21517 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sun Aug 18 13:03:13 2024 (r21516) +++ trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sun Aug 18 13:04:16 2024 (r21517) @@ -70,7 +70,6 @@ failed = failed || !mpt::is_in_range(mpt::random<double>(prng, -1.0, 0.0), -1.0, 0.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng, 1.0, 2.0), 1.0, 2.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng, 1.0, 3.0), 1.0, 3.0); - } for (std::size_t i = 0; i < 10000; ++i) { @@ -99,7 +98,6 @@ failed = failed || !mpt::is_in_range(mpt::random<double>(prng64, -1.0, 0.0), -1.0, 0.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng64, 1.0, 2.0), 1.0, 2.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng64, 1.0, 3.0), 1.0, 3.0); - } for (std::size_t i = 0; i < 10000; ++i) { @@ -128,11 +126,9 @@ failed = failed || !mpt::is_in_range(mpt::random<double>(prng8, -1.0, 0.0), -1.0, 0.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng8, 1.0, 2.0), 1.0, 2.0); failed = failed || !mpt::is_in_range(mpt::random<double>(prng8, 1.0, 3.0), 1.0, 3.0); - } MPT_TEST_EXPECT_EXPR(!failed); - } } // namespace random |
|
From: <sv...@op...> - 2024-08-18 11:03:20
|
Author: manx Date: Sun Aug 18 13:03:13 2024 New Revision: 21516 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21516 Log: [Fix] mpt/random/tests/tests_random.hpp: Compile fix. Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Modified: trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sun Aug 18 12:54:44 2024 (r21515) +++ trunk/OpenMPT/src/mpt/random/tests/tests_random.hpp Sun Aug 18 13:03:13 2024 (r21516) @@ -39,8 +39,8 @@ { mpt::sane_random_device rd; mpt::good_engine prng = mpt::make_prng<mpt::good_engine>(rd); - mpt::any_engine_wrapper<mpt::good_prng, uint64> prng64{prng}; - mpt::any_engine_wrapper<mpt::good_prng, uint8> prng8{prng}; + mpt::any_engine_wrapper<mpt::good_engine, uint64> prng64{prng}; + mpt::any_engine_wrapper<mpt::good_engine, uint8> prng8{prng}; bool failed = false; |
3 messages has been excluded from this view by a project administrator.
