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
(392) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-06-11 20:40:39
|
Author: manx Date: Wed Jun 11 22:40:26 2025 New Revision: 23465 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23465 Log: Merged revision(s) 23464 from trunk/OpenMPT: [Doc] libopenmpt: openmpt123 requires FLAC >= 1.3.0. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/doc/libopenmpt/dependencies.md Modified: branches/OpenMPT-1.32/doc/libopenmpt/dependencies.md ============================================================================== --- branches/OpenMPT-1.32/doc/libopenmpt/dependencies.md Wed Jun 11 22:39:54 2025 (r23464) +++ branches/OpenMPT-1.32/doc/libopenmpt/dependencies.md Wed Jun 11 22:40:26 2025 (r23465) @@ -100,7 +100,7 @@ ### openmpt123 * Rendering to PCM files can use: - * **FLAC 1.2** or higher + * **FLAC 1.3** or higher * **libsndfile** * **Win32** for WAVE * raw PCM has no external dependencies |
|
From: <sv...@op...> - 2025-06-11 20:40:02
|
Author: manx Date: Wed Jun 11 22:39:54 2025 New Revision: 23464 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23464 Log: [Doc] libopenmpt: openmpt123 requires FLAC >= 1.3.0. Modified: trunk/OpenMPT/doc/libopenmpt/dependencies.md Modified: trunk/OpenMPT/doc/libopenmpt/dependencies.md ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/dependencies.md Wed Jun 11 21:48:04 2025 (r23463) +++ trunk/OpenMPT/doc/libopenmpt/dependencies.md Wed Jun 11 22:39:54 2025 (r23464) @@ -100,7 +100,7 @@ ### openmpt123 * Rendering to PCM files can use: - * **FLAC 1.2** or higher + * **FLAC 1.3** or higher * **libsndfile** * **Win32** for WAVE * raw PCM has no external dependencies |
|
From: <sv...@op...> - 2025-06-11 19:48:15
|
Author: manx Date: Wed Jun 11 21:48:04 2025 New Revision: 23463 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23463 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Wed Jun 11 21:47:58 2025 (r23462) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Wed Jun 11 21:48:04 2025 (r23463) @@ -10,8 +10,9 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. - * [**Bug**] openmpt123: Allow for converting to formats which list the file - extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). + * [**Bug**] openmpt123: Allow for converting to libsndfile formats which list + the file extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or + later). * mpg123: Update to v1.33.0 (2025-06-07). |
|
From: <sv...@op...> - 2025-06-11 19:48:05
|
Author: manx Date: Wed Jun 11 21:47:58 2025 New Revision: 23462 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23462 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Wed Jun 11 21:47:54 2025 (r23461) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Wed Jun 11 21:47:58 2025 (r23462) @@ -10,8 +10,9 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. - * [**Bug**] openmpt123: Allow for converting to formats which list the file - extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). + * [**Bug**] openmpt123: Allow for converting to libsndfile formats which list + the file extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or + later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-11 19:48:05
|
Author: manx Date: Wed Jun 11 21:47:54 2025 New Revision: 23461 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23461 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Wed Jun 11 21:47:48 2025 (r23460) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Wed Jun 11 21:47:54 2025 (r23461) @@ -12,8 +12,9 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. - * [**Bug**] openmpt123: Allow for converting to formats which list the file - extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). + * [**Bug**] openmpt123: Allow for converting to libsndfile formats which list + the file extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or + later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-11 19:47:55
|
Author: manx Date: Wed Jun 11 21:47:48 2025 New Revision: 23460 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23460 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Wed Jun 11 21:47:37 2025 (r23459) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Wed Jun 11 21:47:48 2025 (r23460) @@ -12,8 +12,9 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. - * [**Bug**] openmpt123: Allow for converting to formats which list the file - extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). + * [**Bug**] openmpt123: Allow for converting to libsndfile formats which list + the file extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or + later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-11 19:47:45
|
Author: manx Date: Wed Jun 11 21:47:37 2025 New Revision: 23459 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23459 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Wed Jun 11 15:50:19 2025 (r23458) +++ branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Wed Jun 11 21:47:37 2025 (r23459) @@ -10,8 +10,9 @@ * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. * [**Bug**] libopenmpt_test did not build from the MSVC source packages. - * [**Bug**] openmpt123: Allow for converting to formats which list the file - extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). + * [**Bug**] openmpt123: Allow for converting to libsndfile formats which list + the file extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or + later). * [**Change**] TCB was added to the list of supported file extensions. ModLand and Fujiology use this extension for TCB Tracker modules, instead of the |
|
From: <sv...@op...> - 2025-06-11 13:50:32
|
Author: manx Date: Wed Jun 11 15:50:19 2025 New Revision: 23458 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23458 Log: Merged revision(s) 23457 from trunk/OpenMPT: [Fix] openmpt/streamencoder: Remove unwanted dependencies on common/. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp ============================================================================== --- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp Wed Jun 11 15:49:58 2025 (r23457) +++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp Wed Jun 11 15:50:19 2025 (r23458) @@ -7,6 +7,7 @@ #include "openmpt/streamencoder/StreamEncoder.hpp" +#include "mpt/base/alloc.hpp" #include "mpt/base/bit.hpp" #include "mpt/base/macros.hpp" #include "mpt/base/span.hpp" Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp ============================================================================== --- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp Wed Jun 11 15:49:58 2025 (r23457) +++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp Wed Jun 11 15:50:19 2025 (r23458) @@ -8,9 +8,12 @@ #include "openmpt/streamencoder/StreamEncoderMP3.hpp" #include "mpt/base/alloc.hpp" +#include "mpt/base/integer.hpp" #include "mpt/base/macros.hpp" #include "mpt/base/memory.hpp" +#include "mpt/base/numeric.hpp" #include "mpt/base/saturate_cast.hpp" +#include "mpt/base/saturate_round.hpp" #include "mpt/base/span.hpp" #include "mpt/format/message_macros.hpp" #include "mpt/format/simple.hpp" @@ -27,6 +30,7 @@ #include "openmpt/soundfile_data/tags.hpp" #include "openmpt/streamencoder/StreamEncoder.hpp" +#include <algorithm> #include <memory> #include <ostream> #include <string> @@ -513,7 +517,7 @@ { float lame_quality = 10.0f - (settings.Quality * 10.0f); - Limit(lame_quality, 0.0f, 9.999f); + lame_quality = std::clamp(lame_quality, 0.0f, 9.999f); lame_set_VBR_quality(gfp, lame_quality); lame_set_VBR(gfp, vbr_default); Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp ============================================================================== --- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp Wed Jun 11 15:49:58 2025 (r23457) +++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp Wed Jun 11 15:50:19 2025 (r23458) @@ -9,6 +9,7 @@ #include "mpt/base/alloc.hpp" #include "mpt/base/memory.hpp" +#include "mpt/base/pointer.hpp" #include "mpt/base/saturate_cast.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" @@ -32,6 +33,7 @@ #include <cstddef> #if defined(MPT_WITH_OPUS) && defined(MPT_WITH_OPUSENC) +#include <opus.h> #include <opusenc.h> #endif Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp ============================================================================== --- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Wed Jun 11 15:49:58 2025 (r23457) +++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Wed Jun 11 15:50:19 2025 (r23458) @@ -9,6 +9,10 @@ #include "mpt/base/alloc.hpp" #include "mpt/base/saturate_cast.hpp" +#include "mpt/base/saturate_round.hpp" +#include "mpt/format/message.hpp" +#include "mpt/format/message_macros.hpp" +#include "mpt/format/simple.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" #include "mpt/path/native_path.hpp" @@ -21,6 +25,7 @@ #include "openmpt/soundfile_data/tags.hpp" #include "openmpt/streamencoder/StreamEncoder.hpp" +#include <algorithm> #include <memory> #include <ostream> @@ -266,8 +271,8 @@ mpt::ustring VorbisEncoder::DescribeQuality(float quality) const { static constexpr int q_table[11] = {64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500}; // http://wiki.hydrogenaud.io/index.php?title=Recommended_Ogg_Vorbis - int q = Clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10); - return MPT_UFORMAT("Q{} (~{} kbit)")(mpt::ufmt::fix(quality * 10.0f, 1), q_table[q]); + int q = std::clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10); + return MPT_UFORMAT_MESSAGE("Q{} (~{} kbit)")(mpt::format<mpt::ustring>::fix(quality * 10.0f, 1), q_table[q]); } |
|
From: <sv...@op...> - 2025-06-11 13:50:05
|
Author: manx Date: Wed Jun 11 15:49:58 2025 New Revision: 23457 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23457 Log: [Fix] openmpt/streamencoder: Remove unwanted dependencies on common/. Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Wed Jun 11 15:48:39 2025 (r23456) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Wed Jun 11 15:49:58 2025 (r23457) @@ -7,6 +7,7 @@ #include "openmpt/streamencoder/StreamEncoder.hpp" +#include "mpt/base/alloc.hpp" #include "mpt/base/bit.hpp" #include "mpt/base/macros.hpp" #include "mpt/base/span.hpp" Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Wed Jun 11 15:48:39 2025 (r23456) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Wed Jun 11 15:49:58 2025 (r23457) @@ -8,9 +8,12 @@ #include "openmpt/streamencoder/StreamEncoderMP3.hpp" #include "mpt/base/alloc.hpp" +#include "mpt/base/integer.hpp" #include "mpt/base/macros.hpp" #include "mpt/base/memory.hpp" +#include "mpt/base/numeric.hpp" #include "mpt/base/saturate_cast.hpp" +#include "mpt/base/saturate_round.hpp" #include "mpt/base/span.hpp" #include "mpt/format/message_macros.hpp" #include "mpt/format/simple.hpp" @@ -27,6 +30,7 @@ #include "openmpt/soundfile_data/tags.hpp" #include "openmpt/streamencoder/StreamEncoder.hpp" +#include <algorithm> #include <memory> #include <ostream> #include <string> @@ -513,7 +517,7 @@ { float lame_quality = 10.0f - (settings.Quality * 10.0f); - Limit(lame_quality, 0.0f, 9.999f); + lame_quality = std::clamp(lame_quality, 0.0f, 9.999f); lame_set_VBR_quality(gfp, lame_quality); lame_set_VBR(gfp, vbr_default); Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Wed Jun 11 15:48:39 2025 (r23456) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Wed Jun 11 15:49:58 2025 (r23457) @@ -9,6 +9,7 @@ #include "mpt/base/alloc.hpp" #include "mpt/base/memory.hpp" +#include "mpt/base/pointer.hpp" #include "mpt/base/saturate_cast.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" @@ -32,6 +33,7 @@ #include <cstddef> #if defined(MPT_WITH_OPUS) && defined(MPT_WITH_OPUSENC) +#include <opus.h> #include <opusenc.h> #endif Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Wed Jun 11 15:48:39 2025 (r23456) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Wed Jun 11 15:49:58 2025 (r23457) @@ -9,6 +9,10 @@ #include "mpt/base/alloc.hpp" #include "mpt/base/saturate_cast.hpp" +#include "mpt/base/saturate_round.hpp" +#include "mpt/format/message.hpp" +#include "mpt/format/message_macros.hpp" +#include "mpt/format/simple.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" #include "mpt/path/native_path.hpp" @@ -21,6 +25,7 @@ #include "openmpt/soundfile_data/tags.hpp" #include "openmpt/streamencoder/StreamEncoder.hpp" +#include <algorithm> #include <memory> #include <ostream> @@ -266,8 +271,8 @@ mpt::ustring VorbisEncoder::DescribeQuality(float quality) const { static constexpr int q_table[11] = {64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500}; // http://wiki.hydrogenaud.io/index.php?title=Recommended_Ogg_Vorbis - int q = Clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10); - return MPT_UFORMAT("Q{} (~{} kbit)")(mpt::ufmt::fix(quality * 10.0f, 1), q_table[q]); + int q = std::clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10); + return MPT_UFORMAT_MESSAGE("Q{} (~{} kbit)")(mpt::format<mpt::ustring>::fix(quality * 10.0f, 1), q_table[q]); } |
|
From: <sv...@op...> - 2025-06-11 13:48:45
|
Author: manx Date: Wed Jun 11 15:48:39 2025 New Revision: 23456 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23456 Log: Merged revision(s) 23453 from trunk/OpenMPT: [Fix] mpt/random/random.hpp: Add missing include. ........ 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 Wed Jun 11 15:48:18 2025 (r23455) +++ branches/OpenMPT-1.30/src/mpt/random/random.hpp Wed Jun 11 15:48:39 2025 (r23456) @@ -5,6 +5,7 @@ +#include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" |
|
From: <sv...@op...> - 2025-06-11 13:48:30
|
Author: manx Date: Wed Jun 11 15:48:18 2025 New Revision: 23455 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23455 Log: Merged revision(s) 23453 from trunk/OpenMPT: [Fix] mpt/random/random.hpp: Add missing include. ........ 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 Wed Jun 11 15:48:00 2025 (r23454) +++ branches/OpenMPT-1.31/src/mpt/random/random.hpp Wed Jun 11 15:48:18 2025 (r23455) @@ -5,6 +5,7 @@ +#include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" |
|
From: <sv...@op...> - 2025-06-11 13:48:11
|
Author: manx Date: Wed Jun 11 15:48:00 2025 New Revision: 23454 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23454 Log: Merged revision(s) 23453 from trunk/OpenMPT: [Fix] mpt/random/random.hpp: Add missing include. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/random/random.hpp Modified: branches/OpenMPT-1.32/src/mpt/random/random.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/random/random.hpp Wed Jun 11 15:47:34 2025 (r23453) +++ branches/OpenMPT-1.32/src/mpt/random/random.hpp Wed Jun 11 15:48:00 2025 (r23454) @@ -6,6 +6,7 @@ #include "mpt/base/detect.hpp" +#include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" |
|
From: <sv...@op...> - 2025-06-11 13:47:42
|
Author: manx Date: Wed Jun 11 15:47:34 2025 New Revision: 23453 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23453 Log: [Fix] mpt/random/random.hpp: Add missing include. Modified: trunk/OpenMPT/src/mpt/random/random.hpp Modified: trunk/OpenMPT/src/mpt/random/random.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/random.hpp Tue Jun 10 17:38:56 2025 (r23452) +++ trunk/OpenMPT/src/mpt/random/random.hpp Wed Jun 11 15:47:34 2025 (r23453) @@ -6,6 +6,7 @@ #include "mpt/base/detect.hpp" +#include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/random/engine.hpp" |
|
From: <sv...@op...> - 2025-06-10 15:39:09
|
Author: manx Date: Tue Jun 10 17:38:56 2025 New Revision: 23452 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23452 Log: [Fix] build: Legacy 32bit ARM portable packages should included the legacy builds of x86 and amd64 PluginBridge. The modern versions have higher system requirements than the 32bit ARM build itself. Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Mon Jun 9 18:59:37 2025 (r23451) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Tue Jun 10 17:38:56 2025 (r23452) @@ -202,12 +202,14 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_x86_path) Path(openmpt_zip_x86_path + "OpenMPT.portable").touch() + print("Copying x86 legacy binaries...") shutil.rmtree(openmpt_zip_x86_legacy_basepath, ignore_errors=True) copy_binaries(sourcePathLegacy + "x86/", openmpt_zip_x86_legacy_path) copy_pluginbridge(sourcePathLegacy, "x86", openmpt_zip_x86_legacy_path) copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_x86_legacy_path) Path(openmpt_zip_x86_legacy_path + "OpenMPT.portable").touch() + print("Copying amd64 binaries...") shutil.rmtree(openmpt_zip_amd64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "amd64/", openmpt_zip_amd64_path) @@ -217,21 +219,22 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_amd64_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_amd64_path) Path(openmpt_zip_amd64_path + "OpenMPT.portable").touch() + print("Copying amd64 legacy binaries...") shutil.rmtree(openmpt_zip_amd64_legacy_basepath, ignore_errors=True) copy_binaries(sourcePathLegacy + "amd64/", openmpt_zip_amd64_legacy_path) copy_pluginbridge(sourcePathLegacy, "x86", openmpt_zip_amd64_legacy_path) copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_amd64_legacy_path) Path(openmpt_zip_amd64_legacy_path + "OpenMPT.portable").touch() -print("Copying arm binaries...") + +print("Copying arm legacy binaries...") shutil.rmtree(openmpt_zip_arm_legacy_basepath, ignore_errors=True) copy_binaries(sourcePathLegacyARM + "arm/", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathLegacy, "x86", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_arm_legacy_path) copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_arm_legacy_path) Path(openmpt_zip_arm_legacy_path + "OpenMPT.portable").touch() + print("Copying arm64 binaries...") shutil.rmtree(openmpt_zip_arm64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "arm64/", openmpt_zip_arm64_path) @@ -241,6 +244,7 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm64_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_arm64_path) Path(openmpt_zip_arm64_path + "OpenMPT.portable").touch() + print("Copying arm64ec binaries...") shutil.rmtree(openmpt_zip_arm64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "arm64ec/", openmpt_zip_arm64ec_path) Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Mon Jun 9 18:59:37 2025 (r23451) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Tue Jun 10 17:38:56 2025 (r23452) @@ -169,6 +169,7 @@ copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_x86_path) Path(openmpt_zip_x86_path + "OpenMPT.portable").touch() + print("Copying amd64 binaries...") shutil.rmtree(openmpt_zip_amd64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "amd64/", openmpt_zip_amd64_path) |
|
From: <sv...@op...> - 2025-06-09 16:59:44
|
Author: manx Date: Mon Jun 9 18:59:37 2025 New Revision: 23451 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23451 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Jun 9 18:59:15 2025 (r23450) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Mon Jun 9 18:59:37 2025 (r23451) @@ -10,6 +10,8 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). |
|
From: <sv...@op...> - 2025-06-09 16:59:27
|
Author: manx Date: Mon Jun 9 18:59:15 2025 New Revision: 23450 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23450 Log: Merged revision(s) 23444 from branches/OpenMPT-1.30: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:58:40 2025 (r23449) +++ branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:59:15 2025 (r23450) @@ -104,7 +104,7 @@ switch ( match_mode ) { case match_print: log << "sndfile: " - << ( format_info.name ? format_info.name : "" ) << " (" << ( format_info.extension ? format_info.extension : "" ) << ")" + << ( format_info.name ? format_info.name : "" ) << " (" << ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) << ")" << " / " << ( subformat_info.name ? subformat_info.name : "" ) << " [" @@ -117,6 +117,13 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -126,6 +133,13 @@ } break; case match_better: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -135,6 +149,9 @@ } break; case match_any: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:58:52
|
Author: manx Date: Mon Jun 9 18:58:40 2025 New Revision: 23449 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23449 Log: Merged revision(s) 23443 from branches/OpenMPT-1.30: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:58:17 2025 (r23448) +++ branches/OpenMPT-1.28/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:58:40 2025 (r23449) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:58:46
|
Author: manx Date: Mon Jun 9 18:58:17 2025 New Revision: 23448 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23448 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Jun 9 18:57:54 2025 (r23447) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Mon Jun 9 18:58:17 2025 (r23448) @@ -10,6 +10,8 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-09 16:58:06
|
Author: manx Date: Mon Jun 9 18:57:54 2025 New Revision: 23447 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23447 Log: Merged revision(s) 23444 from branches/OpenMPT-1.30: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:32 2025 (r23446) +++ branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:54 2025 (r23447) @@ -104,7 +104,7 @@ switch ( match_mode ) { case match_print: log << "sndfile: " - << ( format_info.name ? format_info.name : "" ) << " (" << ( format_info.extension ? format_info.extension : "" ) << ")" + << ( format_info.name ? format_info.name : "" ) << " (" << ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) << ")" << " / " << ( subformat_info.name ? subformat_info.name : "" ) << " [" @@ -117,6 +117,13 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -126,6 +133,13 @@ } break; case match_better: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -135,6 +149,9 @@ } break; case match_any: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:57:39
|
Author: manx Date: Mon Jun 9 18:57:32 2025 New Revision: 23446 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23446 Log: Merged revision(s) 23443 from branches/OpenMPT-1.30: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:06 2025 (r23445) +++ branches/OpenMPT-1.29/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:57:32 2025 (r23446) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:57:17
|
Author: manx Date: Mon Jun 9 18:57:06 2025 New Revision: 23445 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23445 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 9 18:56:42 2025 (r23444) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 9 18:57:06 2025 (r23445) @@ -12,6 +12,8 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-09 16:56:54
|
Author: manx Date: Mon Jun 9 18:56:42 2025 New Revision: 23444 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23444 Log: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:48:08 2025 (r23443) +++ branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:56:42 2025 (r23444) @@ -104,7 +104,7 @@ switch ( match_mode ) { case match_print: log << "sndfile: " - << ( format_info.name ? format_info.name : "" ) << " (" << ( format_info.extension ? format_info.extension : "" ) << ")" + << ( format_info.name ? format_info.name : "" ) << " (" << ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) << ")" << " / " << ( subformat_info.name ? subformat_info.name : "" ) << " [" @@ -117,6 +117,13 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -126,6 +133,13 @@ } break; case match_better: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } + } if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); @@ -135,6 +149,9 @@ } break; case match_any: + if ( subformat_info.extension && ( extension == subformat_info.extension ) ) { + return matched_result( format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } |
|
From: <sv...@op...> - 2025-06-09 16:48:14
|
Author: manx Date: Mon Jun 9 18:48:08 2025 New Revision: 23443 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23443 Log: Merged revision(s) 23435 from trunk/OpenMPT: [Fix] openmpt123: Guard against libsndfile returning nullptr as file extension when matching the file format. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:54 2025 (r23442) +++ branches/OpenMPT-1.30/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:48:08 2025 (r23443) @@ -117,7 +117,7 @@ case match_recurse: break; case match_exact: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ } break; case match_better: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ } break; case match_any: - if ( extension == format_info.extension ) { + if ( format_info.extension && ( extension == format_info.extension ) ) { return matched_result( format_info, subformat_info, match_mode ); } break; |
|
From: <sv...@op...> - 2025-06-09 16:46:00
|
Author: manx Date: Mon Jun 9 18:45:54 2025 New Revision: 23442 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23442 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 9 18:45:32 2025 (r23441) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 9 18:45:54 2025 (r23442) @@ -12,6 +12,8 @@ string. * [**Bug**] Work-around broken user locale support on Haiku by always assuming UTF8. + * [**Bug**] openmpt123: Allow for converting to formats which list the file + extension only in the subformat (i.e. MP3 with libsndfile 1.1.0 or later). * mpg123: Update to v1.33.0 (2025-06-07). * miniz: Update to v3.0.2 (2023-01-15). |
|
From: <sv...@op...> - 2025-06-09 16:45:44
|
Author: manx Date: Mon Jun 9 18:45:32 2025 New Revision: 23441 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23441 Log: Merged revision(s) 23436 from trunk/OpenMPT: [Fix] openmpt123: We need to also consider file extensions of subformats. This is necessary because MP3 is a subformat and the major format lists only .m1a as file extension. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Modified: branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp ============================================================================== --- branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:10 2025 (r23440) +++ branches/OpenMPT-1.31/openmpt123/openmpt123_sndfile.hpp Mon Jun 9 18:45:32 2025 (r23441) @@ -106,7 +106,7 @@ switch ( match_mode ) { case match_print: log << MPT_USTRING("sndfile: ") - << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") + << mpt::transcode<mpt::ustring>( sndfile_encoding, ( format_info.name ? format_info.name : "" ) ) << MPT_USTRING(" (.") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.extension ? subformat_info.extension : format_info.extension ? format_info.extension : "" ) ) << MPT_USTRING(")") << MPT_USTRING(" / ") << mpt::transcode<mpt::ustring>( sndfile_encoding, ( subformat_info.name ? subformat_info.name : "" ) ) << MPT_USTRING(" [") @@ -117,6 +117,14 @@ case match_recurse: break; case match_exact: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -126,6 +134,14 @@ } break; case match_better: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } + } + break; if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); @@ -135,6 +151,9 @@ } break; case match_any: + if ( subformat_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == subformat_info.extension ) ) { + return matched_result( format, format_info, subformat_info, match_mode ); + } if ( format_info.extension && ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } |
3 messages has been excluded from this view by a project administrator.
