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
(120) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-09-13 15:11:21
|
Author: manx Date: Fri Sep 13 17:11:09 2024 New Revision: 21589 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21589 Log: [Fix] build: Makefile: Package MSVC project files for Windwos XP ANSI. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Sep 13 17:07:37 2024 (r21588) +++ trunk/OpenMPT/Makefile Fri Sep 13 17:11:09 2024 (r21589) @@ -1894,6 +1894,7 @@ svn export ./build/scriptlib bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/scriptlib --native-eol CRLF svn export ./build/svn_version bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version --native-eol CRLF svn export ./build/vs bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs --native-eol CRLF + svn export ./build/vs2017winxpansi bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxpansi --native-eol CRLF svn export ./build/vs2017winxp bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxp --native-eol CRLF svn export ./build/vs2019win7 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win7 --native-eol CRLF svn export ./build/vs2019win8 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win8 --native-eol CRLF |
|
From: <sv...@op...> - 2024-09-13 15:07:44
|
Author: manx Date: Fri Sep 13 17:07:37 2024 New Revision: 21588 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21588 Log: [Fix] build: Makefile: Package MSVC Win8 project files. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Fri Sep 13 15:01:06 2024 (r21587) +++ trunk/OpenMPT/Makefile Fri Sep 13 17:07:37 2024 (r21588) @@ -1896,10 +1896,12 @@ svn export ./build/vs bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs --native-eol CRLF svn export ./build/vs2017winxp bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxp --native-eol CRLF svn export ./build/vs2019win7 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win7 --native-eol CRLF + svn export ./build/vs2019win8 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win8 --native-eol CRLF svn export ./build/vs2019win81 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win81 --native-eol CRLF svn export ./build/vs2019win10 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win10 --native-eol CRLF svn export ./build/vs2019win10uwp bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win10uwp --native-eol CRLF svn export ./build/vs2022win7 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win7 --native-eol CRLF + svn export ./build/vs2022win8 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win8 --native-eol CRLF svn export ./build/vs2022win81 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win81 --native-eol CRLF svn export ./build/vs2022win10 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10 --native-eol CRLF svn export ./build/vs2022win10uwp bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10uwp --native-eol CRLF |
|
From: <sv...@op...> - 2024-09-13 13:01:15
|
Author: manx Date: Fri Sep 13 15:01:06 2024 New Revision: 21587 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21587 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -60,7 +60,7 @@ std::size_t written = 0; MPT_MAYBE_CONSTANT_IF(endian == mpt::get_endian() && format.encoding != Encoder::Format::Encoding::Alaw && format.encoding != Encoder::Format::Encoding::ulaw) { - if(!mpt::IO::WriteRaw(f, reinterpret_cast<const std::byte*>(interleaved), frameCount * channels * format.GetSampleFormat().GetSampleSize())) + if(!mpt::IO::WriteRaw(f, reinterpret_cast<const std::byte *>(interleaved), frameCount * channels * format.GetSampleFormat().GetSampleSize())) { success = false; } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -30,6 +30,8 @@ +// clang-format off + inline constexpr int opus_bitrates [] = { 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384, 448, 510 }; @@ -65,187 +67,188 @@ 48000, 44100, 32000 }; +// clang-format on + namespace Encoder { - enum Mode +enum Mode +{ + ModeCBR = 1 << 0, + ModeABR = 1 << 1, + ModeVBR = 1 << 2, + ModeQuality = 1 << 3, + ModeLossless = 1 << 4, + ModeInvalid = 0 +}; + +struct Format +{ + enum class Encoding { - ModeCBR = 1<<0, - ModeABR = 1<<1, - ModeVBR = 1<<2, - ModeQuality = 1<<3, - ModeLossless = 1<<4, - ModeInvalid = 0 + Float = 1, + Integer = 2, + Alaw = 3, + ulaw = 4, + Unsigned = 5, }; - - struct Format + Encoding encoding; + uint8 bits; + mpt::endian endian; + bool operator==(const Format &other) const { - enum class Encoding - { - Float = 1, - Integer = 2, - Alaw = 3, - ulaw = 4, - Unsigned = 5, - }; - Encoding encoding; - uint8 bits; - mpt::endian endian; - bool operator==(const Format &other) const - { - return encoding == other.encoding && bits == other.bits && endian == other.endian; - } - bool operator!=(const Format& other) const - { - return encoding != other.encoding || bits != other.bits || endian != other.endian; - } - int32 AsInt() const - { - return (static_cast<int32>(endian == mpt::endian::little) << 16) | (static_cast<int32>(encoding) << 8) | static_cast<int32>(bits); - } - static Format FromInt(int32 val) - { - Encoder::Format f; - f.bits = val & 0xff; - f.encoding = static_cast<Encoder::Format::Encoding>((val >> 8) & 0xff); - f.endian = ((val >> 16) & 0xff) ? mpt::endian::little : mpt::endian::big; - return f; - } - SampleFormat GetSampleFormat() const + return encoding == other.encoding && bits == other.bits && endian == other.endian; + } + bool operator!=(const Format &other) const + { + return encoding != other.encoding || bits != other.bits || endian != other.endian; + } + int32 AsInt() const + { + return (static_cast<int32>(endian == mpt::endian::little) << 16) | (static_cast<int32>(encoding) << 8) | static_cast<int32>(bits); + } + static Format FromInt(int32 val) + { + Encoder::Format f; + f.bits = val & 0xff; + f.encoding = static_cast<Encoder::Format::Encoding>((val >> 8) & 0xff); + f.endian = ((val >> 16) & 0xff) ? mpt::endian::little : mpt::endian::big; + return f; + } + SampleFormat GetSampleFormat() const + { + SampleFormat result = SampleFormat::Default; + switch(encoding) { - SampleFormat result = SampleFormat::Default; - switch(encoding) - { case Encoding::Float: switch(bits) { - case 32: - result = SampleFormat::Float32; - break; - case 64: - result = SampleFormat::Float64; - break; + case 32: + result = SampleFormat::Float32; + break; + case 64: + result = SampleFormat::Float64; + break; } break; case Encoding::Integer: switch(bits) { - case 8: - result = SampleFormat::Int8; - break; - case 16: - result = SampleFormat::Int16; - break; - case 24: - result = SampleFormat::Int24; - break; - case 32: - result = SampleFormat::Int32; - break; + case 8: + result = SampleFormat::Int8; + break; + case 16: + result = SampleFormat::Int16; + break; + case 24: + result = SampleFormat::Int24; + break; + case 32: + result = SampleFormat::Int32; + break; } break; case Encoding::Alaw: - switch (bits) + switch(bits) { - case 16: - result = SampleFormat::Int16; - break; + case 16: + result = SampleFormat::Int16; + break; } break; case Encoding::ulaw: - switch (bits) + switch(bits) { - case 16: - result = SampleFormat::Int16; - break; + case 16: + result = SampleFormat::Int16; + break; } break; case Encoding::Unsigned: - switch (bits) + switch(bits) { - case 8: - result = SampleFormat::Unsigned8; - break; + case 8: + result = SampleFormat::Unsigned8; + break; } break; - } - return result; } - }; + return result; + } +}; - struct Traits - { - - mpt::native_path fileExtension; - mpt::ustring fileShortDescription; - mpt::ustring encoderSettingsName; - - mpt::ustring fileDescription; - - bool canTags = false; - std::vector<mpt::ustring> genres; - int modesWithFixedGenres = 0; - - bool canCues = false; - - int maxChannels = 0; - std::vector<uint32> samplerates; - - int modes = Encoder::ModeInvalid; - std::vector<int> bitrates; - std::vector<Format> formats; - - uint32 defaultSamplerate = 48000; - uint16 defaultChannels = 2; - - Encoder::Mode defaultMode = Encoder::ModeInvalid; - int defaultBitrate = 0; - float defaultQuality = 0.0f; - Format defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; - int defaultDitherType = 1; - }; +struct Traits +{ - struct StreamSettings - { - int32 FLACCompressionLevel = 5; // 8 - uint32 AUPaddingAlignHint = 4096; - uint32 MP3ID3v2MinPadding = 1024; - uint32 MP3ID3v2PaddingAlignHint = 4096; - bool MP3ID3v2WriteReplayGainTXXX = true; - int32 MP3LameQuality = 3; // 0 - bool MP3LameID3v2UseLame = false; - bool MP3LameCalculateReplayGain = true; - bool MP3LameCalculatePeakSample = true; - int32 OpusComplexity = -1; // 10 - }; + mpt::native_path fileExtension; + mpt::ustring fileShortDescription; + mpt::ustring encoderSettingsName; - struct Settings - { + mpt::ustring fileDescription; - bool Cues; - bool Tags; + bool canTags = false; + std::vector<mpt::ustring> genres; + int modesWithFixedGenres = 0; - uint32 Samplerate; - uint16 Channels; + bool canCues = false; - Encoder::Mode Mode; - int Bitrate; - float Quality; - Encoder::Format Format; - int Dither; + int maxChannels = 0; + std::vector<uint32> samplerates; - StreamSettings Details; + int modes = Encoder::ModeInvalid; + std::vector<int> bitrates; + std::vector<Format> formats; - }; + uint32 defaultSamplerate = 48000; + uint16 defaultChannels = 2; + + Encoder::Mode defaultMode = Encoder::ModeInvalid; + int defaultBitrate = 0; + float defaultQuality = 0.0f; + Format defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; + int defaultDitherType = 1; +}; -} // namespace Encoder +struct StreamSettings +{ + int32 FLACCompressionLevel = 5; // 8 + uint32 AUPaddingAlignHint = 4096; + uint32 MP3ID3v2MinPadding = 1024; + uint32 MP3ID3v2PaddingAlignHint = 4096; + bool MP3ID3v2WriteReplayGainTXXX = true; + int32 MP3LameQuality = 3; // 0 + bool MP3LameID3v2UseLame = false; + bool MP3LameCalculateReplayGain = true; + bool MP3LameCalculatePeakSample = true; + int32 OpusComplexity = -1; // 10 +}; + +struct Settings +{ + + bool Cues; + bool Tags; + + uint32 Samplerate; + uint16 Channels; + + Encoder::Mode Mode; + int Bitrate; + float Quality; + Encoder::Format Format; + int Dither; + + StreamSettings Details; +}; + +} // namespace Encoder class IAudioStreamEncoder { protected: - IAudioStreamEncoder() { } + IAudioStreamEncoder() {} public: virtual ~IAudioStreamEncoder() = default; public: @@ -257,7 +260,7 @@ virtual void WriteInterleaved(std::size_t frameCount, const int16 *interleaved) = 0; virtual void WriteInterleaved(std::size_t frameCount, const int8 *interleaved) = 0; virtual void WriteInterleaved(std::size_t frameCount, const uint8 *interleaved) = 0; - virtual void WriteCues(const std::vector<uint64> &cues) = 0; // optional + virtual void WriteCues(const std::vector<uint64> &cues) = 0; // optional virtual void WriteFinalize() = 0; }; @@ -284,7 +287,7 @@ class StreamWriterBase : public IAudioStreamEncoder { -protected: +protected: std::ostream &f; mpt::IO::Offset fStart; std::vector<std::byte> buf; @@ -312,7 +315,7 @@ private: Encoder::Traits m_Traits; protected: - EncoderFactoryBase() { } + EncoderFactoryBase() {} virtual ~EncoderFactoryBase() = default; void SetTraits(const Encoder::Traits &traits); public: Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -47,13 +47,13 @@ Encoder::Settings settings; private: - static std::string TagToAnnotation(const std::string & field, const mpt::ustring & tag) + static std::string TagToAnnotation(const std::string &field, const mpt::ustring &tag) { if(tag.empty()) { return std::string(); } - return MPT_AFORMAT_MESSAGE("{}={}\n")(field, mpt::transcode<std::string>(mpt::common_encoding::utf8, mpt::replace(tag, MPT_USTRING("="), MPT_UTF8_STRING("\xEF\xBF\xBD")))); // U+FFFD + return MPT_AFORMAT_MESSAGE("{}={}\n")(field, mpt::transcode<std::string>(mpt::common_encoding::utf8, mpt::replace(tag, MPT_USTRING("="), MPT_UTF8_STRING("\xEF\xBF\xBD")))); // U+FFFD } public: @@ -97,22 +97,22 @@ { switch(settings.Format.bits) { - case 32: encoding = 6; break; - case 64: encoding = 7; break; + case 32: encoding = 6; break; + case 64: encoding = 7; break; } } else if(settings.Format.encoding == Encoder::Format::Encoding::Integer) { switch(settings.Format.bits) { - case 8: encoding = 2; break; - case 16: encoding = 3; break; - case 24: encoding = 4; break; - case 32: encoding = 5; break; + case 8: encoding = 2; break; + case 16: encoding = 3; break; + case 24: encoding = 4; break; + case 32: encoding = 5; break; } } else if(settings.Format.encoding == Encoder::Format::Encoding::Alaw) { encoding = 27; - } else if (settings.Format.encoding == Encoder::Format::Encoding::ulaw) + } else if(settings.Format.encoding == Encoder::Format::Encoding::ulaw) { encoding = 1; } @@ -128,7 +128,6 @@ { mpt::IO::WriteIntBE<uint8>(f, '\0'); } - } SampleFormat GetSampleFormat() const override @@ -193,18 +192,18 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Alaw, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::ulaw, 16, mpt::endian::big }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Alaw, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::ulaw, 16, mpt::endian::big}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::big }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::big}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class AUtreamWriter; @@ -35,7 +35,6 @@ public: AUEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -36,7 +36,7 @@ #include <FLAC/metadata.h> #include <FLAC/format.h> #include <FLAC/stream_encoder.h> -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC @@ -122,26 +122,25 @@ int compressionLevel = settings.Details.FLACCompressionLevel; FLAC__stream_encoder_set_compression_level(encoder, compressionLevel); - + if(settings.Tags) { flac_metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); FLAC__stream_encoder_set_metadata(encoder, flac_metadata, 1); } FLAC__stream_encoder_init_stream(encoder, FLACWriteCallback, FLACSeekCallback, FLACTellCallback, nullptr, this); - } SampleFormat GetSampleFormat() const override { @@ -200,7 +199,7 @@ } }; -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC @@ -216,17 +215,17 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; -#if (FLAC_API_VERSION_CURRENT >= 12) - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::get_endian() }); +#if(FLAC_API_VERSION_CURRENT >= 12) + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::get_endian()}); #endif - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::get_endian() }); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::get_endian()}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Integer, 24, mpt::get_endian() }; -#endif // MPT_WITH_FLAC + traits.defaultFormat = {Encoder::Format::Encoding::Integer, 24, mpt::get_endian()}; +#endif // MPT_WITH_FLAC SetTraits(traits); } @@ -235,9 +234,9 @@ { #if defined(MPT_WITH_FLAC) return true; -#else // !MPT_WITH_FLAC +#else // !MPT_WITH_FLAC return false; -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC } @@ -251,12 +250,12 @@ #ifdef MPT_WITH_FLAC result = std::make_unique<FLACStreamWriter>(*this, file, settings, tags); MPT_UNUSED(prng); -#else // !MPT_WITH_FLAC +#else // !MPT_WITH_FLAC MPT_UNUSED(file); MPT_UNUSED(settings); MPT_UNUSED(tags); MPT_UNUSED(prng); -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC return result; } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class FLACEncoder : public EncoderFactoryBase { @@ -30,7 +30,6 @@ public: FLACEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -43,7 +43,7 @@ #else #include <lame/lame.h> #endif -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME @@ -56,9 +56,9 @@ struct ID3v2Header { - uint8 signature[3]; - uint8 version[2]; - uint8be flags; + uint8 signature[3]; + uint8 version[2]; + uint8be flags; uint32be size; }; @@ -66,7 +66,7 @@ struct ID3v2Frame { - char frameid[4]; + char frameid[4]; uint32be size; uint16be flags; }; @@ -79,7 +79,7 @@ // $01 = UTF-16 with BOM. Terminated with $00 00. // $02 = UTF-16BE without BOM. Terminated with $00 00. // $03 = UTF-8. Terminated with $00. -#define ID3v2_CHARSET '\3' +#define ID3v2_CHARSET '\3' #define ID3v2_TEXTENDING '\0' struct ReplayGain @@ -170,7 +170,7 @@ void ID3V2Tagger::WriteID3v2Tags(std::ostream &s, const FileTags &tags, ReplayGain replayGain) { if(!s) return; - + ID3v2Header tHeader; mpt::IO::Offset fOffset = mpt::IO::TellWrite(s); uint32 paddingSize = 0; @@ -179,10 +179,10 @@ // Correct header will be written later (tag size missing) memcpy(tHeader.signature, "ID3", 3); - tHeader.version[0] = 0x04; // Version 2.4.0 - tHeader.version[1] = 0x00; // Ditto - tHeader.flags = 0; // No flags - tHeader.size = 0; // will be filled later + tHeader.version[0] = 0x04; // Version 2.4.0 + tHeader.version[1] = 0x00; // Ditto + tHeader.flags = 0; // No flags + tHeader.size = 0; // will be filled later mpt::IO::Write(s, tHeader); totalID3v2Size += sizeof(tHeader); @@ -228,17 +228,16 @@ mpt::IO::SeekAbsolute(s, fOffset); mpt::IO::Write(s, tHeader); mpt::IO::SeekRelative(s, totalID3v2Size - sizeof(tHeader)); - } uint32 ID3V2Tagger::GetMaxReplayGainTxxxTrackGainFrameSize() { - return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_GAIN") + 1 + std::strlen("-123.45 dB") + 1); // should be enough + return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_GAIN") + 1 + std::strlen("-123.45 dB") + 1); // should be enough } uint32 ID3V2Tagger::GetMaxReplayGainTxxxTrackPeakFrameSize() { - return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_PEAK") + 1 + std::strlen("2147483648.123456") + 1); // unrealistic worst case + return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_PEAK") + 1 + std::strlen("2147483648.123456") + 1); // unrealistic worst case } uint32 ID3V2Tagger::GetMaxReplayGainFramesSizes() @@ -260,7 +259,7 @@ std::string content; - content += std::string(1, 0x00); // ISO-8859-1 + content += std::string(1, 0x00); // ISO-8859-1 content += std::string("REPLAYGAIN_TRACK_GAIN"); content += std::string(1, '\0'); @@ -284,11 +283,10 @@ std::memset(&frame, 0, sizeof(ID3v2Frame)); std::memcpy(&frame.frameid, "TXXX", 4); frame.size = intToSynchsafe(static_cast<uint32>(content.size())); - frame.flags = 0x4000; // discard if audio data changed + frame.flags = 0x4000; // discard if audio data changed mpt::IO::Write(s, frame); mpt::IO::Write(s, mpt::as_span(content)); } - } @@ -297,7 +295,7 @@ std::string content; - content += std::string(1, 0x00); // ISO-8859-1 + content += std::string(1, 0x00); // ISO-8859-1 content += std::string("REPLAYGAIN_TRACK_PEAK"); content += std::string(1, '\0'); @@ -316,13 +314,11 @@ std::memset(&frame, 0, sizeof(ID3v2Frame)); std::memcpy(&frame.frameid, "TXXX", 4); frame.size = intToSynchsafe(static_cast<uint32>(content.size())); - frame.flags = 0x4000; // discard if audio data changed + frame.flags = 0x4000; // discard if audio data changed mpt::IO::Write(s, frame); mpt::IO::Write(s, mpt::as_span(content)); } - } - } // Write a ID3v2 frame @@ -348,9 +344,9 @@ { ID3v2Frame tFrame; std::memset(&tFrame, 0, sizeof(ID3v2Frame)); - std::memcpy(&tFrame.frameid, cFrameID, 4); // ID - tFrame.size = intToSynchsafe(static_cast<uint32>(sFramecontent.size())); // Text size - tFrame.flags = 0x0000; // No flags + std::memcpy(&tFrame.frameid, cFrameID, 4); // ID + tFrame.size = intToSynchsafe(static_cast<uint32>(sFramecontent.size())); // Text size + tFrame.flags = 0x0000; // No flags mpt::IO::Write(s, tFrame); mpt::IO::Write(s, mpt::as_span(sFramecontent)); @@ -390,15 +386,9 @@ id3tag_genre_list(&GenreEnumCallback, &traits); traits.modesWithFixedGenres = (compatible ? Encoder::ModeCBR : Encoder::ModeInvalid); traits.maxChannels = 2; - traits.samplerates = (compatible - ? mpt::make_vector(mpeg1layer3_samplerates) - : mpt::make_vector(layer3_samplerates) - ); + traits.samplerates = (compatible ? mpt::make_vector(mpeg1layer3_samplerates) : mpt::make_vector(layer3_samplerates)); traits.modes = (compatible ? Encoder::ModeCBR : (Encoder::ModeABR | Encoder::ModeQuality)); - traits.bitrates = (compatible - ? mpt::make_vector(mpeg1layer3_bitrates) - : mpt::make_vector(layer3_bitrates) - ); + traits.bitrates = (compatible ? mpt::make_vector(mpeg1layer3_bitrates) : mpt::make_vector(layer3_bitrates)); traits.defaultSamplerate = 44100; traits.defaultChannels = 2; traits.defaultMode = (compatible ? Encoder::ModeCBR : Encoder::ModeQuality); @@ -528,30 +518,29 @@ lame_set_VBR(gfp, vbr_default); lame_set_bWriteVbrTag(gfp, 1); - } - lame_set_decode_on_the_fly(gfp, settings.Details.MP3LameCalculatePeakSample ? 1 : 0); // see LAME docs for why + lame_set_decode_on_the_fly(gfp, settings.Details.MP3LameCalculatePeakSample ? 1 : 0); // see LAME docs for why lame_set_findReplayGain(gfp, settings.Details.MP3LameCalculateReplayGain ? 1 : 0); switch(id3type) { - case ID3None: - lame_set_write_id3tag_automatic(gfp, 0); - break; - case ID3v1: - id3tag_init(gfp); - id3tag_v1_only(gfp); - break; - case ID3v2Lame: - id3tag_init(gfp); - id3tag_add_v2(gfp); - id3tag_v2_only(gfp); - id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding); - break; - case ID3v2OpenMPT: - lame_set_write_id3tag_automatic(gfp, 0); - break; + case ID3None: + lame_set_write_id3tag_automatic(gfp, 0); + break; + case ID3v1: + id3tag_init(gfp); + id3tag_v1_only(gfp); + break; + case ID3v2Lame: + id3tag_init(gfp); + id3tag_add_v2(gfp); + id3tag_v2_only(gfp); + id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding); + break; + case ID3v2OpenMPT: + lame_set_write_id3tag_automatic(gfp, 0); + break; } Mode = settings.Mode; @@ -561,13 +550,13 @@ if(id3type == ID3v2Lame || id3type == ID3v1) { // Lame API expects Latin1, which is sad, but we cannot change that. - if(!tags.title.empty()) id3tag_set_title( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title ).c_str()); - if(!tags.artist.empty()) id3tag_set_artist( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.artist ).c_str()); - if(!tags.album.empty()) id3tag_set_album( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.album ).c_str()); - if(!tags.year.empty()) id3tag_set_year( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.year ).c_str()); + if(!tags.title.empty()) id3tag_set_title(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title).c_str()); + if(!tags.artist.empty()) id3tag_set_artist(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.artist).c_str()); + if(!tags.album.empty()) id3tag_set_album(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.album).c_str()); + if(!tags.year.empty()) id3tag_set_year(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.year).c_str()); if(!tags.comments.empty()) id3tag_set_comment(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.comments).c_str()); - if(!tags.trackno.empty()) id3tag_set_track( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno ).c_str()); - if(!tags.genre.empty()) id3tag_set_genre( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre ).c_str()); + if(!tags.trackno.empty()) id3tag_set_track(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno).c_str()); + if(!tags.genre.empty()) id3tag_set_genre(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre).c_str()); } else if(id3type == ID3v2OpenMPT) { Tags = tags; @@ -583,7 +572,6 @@ id3v2Size = id3end - id3beg; } } - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -596,15 +584,15 @@ while(count > 0) { int count_chunk = std::clamp(mpt::saturate_cast<int>(count), int(0), count_max); - buf.resize(count_chunk + (count_chunk+3)/4 + 7200); + buf.resize(count_chunk + (count_chunk + 3) / 4 + 7200); int result = 0; if(lame_get_num_channels(gfp) == 1) { // lame always assumes stereo input with interleaved interface, so use non-interleaved for mono - result = lame_encode_buffer_ieee_float(gfp, interleaved, nullptr, count_chunk, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size())); + result = lame_encode_buffer_ieee_float(gfp, interleaved, nullptr, count_chunk, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size())); } else { - result = lame_encode_buffer_interleaved_ieee_float(gfp, interleaved, count_chunk, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size())); + result = lame_encode_buffer_interleaved_ieee_float(gfp, interleaved, count_chunk, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size())); } buf.resize((result >= 0) ? result : 0); if(result == -2) @@ -623,7 +611,7 @@ gfp_inited = true; } buf.resize(7200); - buf.resize(lame_encode_flush(gfp, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size()))); + buf.resize(lame_encode_flush(gfp, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size()))); WriteBuffer(); ReplayGain replayGain; if(settings.Details.MP3LameCalculatePeakSample) @@ -637,12 +625,12 @@ replayGain.TrackGaindBValid = true; } if(id3type == ID3v2OpenMPT && (settings.Details.MP3LameCalculatePeakSample || settings.Details.MP3LameCalculateReplayGain)) - { // update ID3v2 tag with replay gain information + { // update ID3v2 tag with replay gain information replayGain.Tag = ReplayGain::TagWrite; mpt::IO::Offset endPos = mpt::IO::TellWrite(f); mpt::IO::SeekAbsolute(f, fStart); std::string tagdata(static_cast<std::size_t>(id3v2Size), '\0'); - mpt::IO::Write(f, mpt::as_span(tagdata.data(), mpt::saturate_cast<std::size_t>(id3v2Size))); // clear out the old tag + mpt::IO::Write(f, mpt::as_span(tagdata.data(), mpt::saturate_cast<std::size_t>(id3v2Size))); // clear out the old tag mpt::IO::SeekAbsolute(f, fStart); ID3V2Tagger tagger(settings.Details); tagger.WriteID3v2Tags(f, Tags, replayGain); @@ -660,7 +648,7 @@ mpt::IO::Offset endPos = mpt::IO::TellWrite(f); mpt::IO::SeekAbsolute(f, fStart + id3v2Size); buf.resize(lame_get_lametag_frame(gfp, nullptr, 0)); - buf.resize(lame_get_lametag_frame(gfp, mpt::byte_cast<unsigned char*>(buf.data()), buf.size())); + buf.resize(lame_get_lametag_frame(gfp, mpt::byte_cast<unsigned char *>(buf.data()), buf.size())); WriteBuffer(); mpt::IO::SeekAbsolute(f, endPos); } @@ -677,7 +665,7 @@ } }; -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME @@ -697,7 +685,7 @@ SetTraits(BuildTraits(true)); return; } -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME } @@ -707,7 +695,7 @@ #ifdef MPT_WITH_LAME || (m_Type == MP3EncoderLame) || (m_Type == MP3EncoderLameCompatible) -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME ; } @@ -723,12 +711,12 @@ { result = std::make_unique<MP3LameStreamWriter>(file, (m_Type == MP3EncoderLameCompatible), settings, tags); MPT_UNUSED(prng); -#else // !MPT_WITH_LAME +#else // !MPT_WITH_LAME MPT_UNUSED(file); MPT_UNUSED(settings); MPT_UNUSED(tags); MPT_UNUSED(prng); -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME } return result; } @@ -739,7 +727,7 @@ #ifdef MPT_WITH_LAME if(m_Type == MP3EncoderLame) { - static constexpr int q_table[11] = { 240, 220, 190, 170, 160, 130, 120, 100, 80, 70, 50 }; // http://wiki.hydrogenaud.io/index.php?title=LAME + static constexpr int q_table[11] = {240, 220, 190, 170, 160, 130, 120, 100, 80, 70, 50}; // http://wiki.hydrogenaud.io/index.php?title=LAME int q = mpt::saturate_round<int>((1.0f - quality) * 10.0f); if(q < 0) q = 0; if(q >= 10) @@ -750,7 +738,7 @@ return MPT_UFORMAT_MESSAGE("VBR -V{} (~{} kbit)")(q, q_table[q]); } } -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME return EncoderFactoryBase::DescribeQuality(quality); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -43,7 +43,6 @@ public: MP3Encoder(MP3EncoderType type); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -71,7 +71,7 @@ OpusEncCallbacks ope_callbacks; OggOpusComments *ope_comments; OggOpusEnc *ope_encoder; - std::vector<std::pair<std::string, std::string> > opus_comments; + std::vector<std::pair<std::string, std::string>> opus_comments; private: static int CallbackWrite(void *user_data, const unsigned char *ptr, opus_int32 len) { @@ -91,7 +91,7 @@ { return 1; } - const std::byte *pb = mpt::byte_cast<const std::byte*>(ptr); + const std::byte *pb = mpt::byte_cast<const std::byte *>(ptr); buf.assign(pb, pb + len); WriteBuffer(); return 0; @@ -121,17 +121,17 @@ if(settings.Tags) { - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); } int ope_error = 0; @@ -139,14 +139,14 @@ ope_comments = ope_comments_create(); if(settings.Tags && ope_comments) { - for(const auto & comment : opus_comments) + for(const auto &comment : opus_comments) { ope_comments_add(ope_comments, comment.first.c_str(), comment.second.c_str()); } } ope_encoder = ope_encoder_create_callbacks(&ope_callbacks, this, ope_comments, settings.Samplerate, settings.Channels, settings.Channels > 2 ? 1 : 0, &ope_error); - + opus_int32 ctl_serial = mpt::random<uint32>(prng); ope_encoder_ctl(ope_encoder, OPE_SET_SERIALNO(ctl_serial)); @@ -172,7 +172,6 @@ } ope_encoder_flush_header(ope_encoder); - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -196,7 +195,7 @@ } }; -#endif // MPT_WITH_OGG +#endif // MPT_WITH_OGG Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -30,7 +30,6 @@ public: OggOpusEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -150,24 +150,24 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Alaw, 16, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::ulaw, 16, mpt::get_endian() }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Alaw, 16, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::ulaw, 16, mpt::get_endian()}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class RawStreamWriter; @@ -35,7 +35,6 @@ public: RAWEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -70,13 +70,13 @@ class VorbisStreamWriter : public StreamWriterBase { private: - ogg_stream_state os; - ogg_page og; - ogg_packet op; - vorbis_info vi; - vorbis_comment vc; - vorbis_dsp_state vd; - vorbis_block vb; + ogg_stream_state os; + ogg_page og; + ogg_packet op; + vorbis_info vi; + vorbis_comment vc; + vorbis_dsp_state vd; + vorbis_block vb; int vorbis_channels; private: void WritePage() @@ -120,17 +120,17 @@ if(settings.Tags) { - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); } ogg_packet header; @@ -148,7 +148,6 @@ { WritePage(); } - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -162,7 +161,7 @@ { for(int channel = 0; channel < vorbis_channels; ++channel) { - buffer[channel][frame] = interleaved[frame*vorbis_channels+channel]; + buffer[channel][frame] = interleaved[frame * vorbis_channels + channel]; } } vorbis_analysis_wrote(&vd, countChunk); @@ -179,7 +178,7 @@ } } } - } + } } void WriteFinalize() override { @@ -212,7 +211,7 @@ } }; -#endif // MPT_WITH_OGG && MPT_WITH_VORBIS && MPT_WITH_VORBISENC +#endif // MPT_WITH_OGG && MPT_WITH_VORBIS && MPT_WITH_VORBISENC @@ -266,7 +265,7 @@ 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 + 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]); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -33,7 +33,6 @@ public: VorbisEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -63,7 +63,6 @@ } fileWAV->StartChunk(RIFFChunk::iddata); - } SampleFormat GetSampleFormat() const override { @@ -115,8 +114,8 @@ cuePoint.id = index++; cuePoint.position = static_cast<uint32>(cue); cuePoint.riffChunkID = static_cast<uint32>(RIFFChunk::iddata); - cuePoint.chunkStart = 0; // we use no Wave List Chunk (wavl) as we have only one data block, so this should be 0. - cuePoint.blockStart = 0; // ditto + cuePoint.chunkStart = 0; // we use no Wave List Chunk (wavl) as we have only one data block, so this should be 0. + cuePoint.blockStart = 0; // ditto cuePoint.offset = cuePoint.position; mpt::IO::Write(f, cuePoint); } @@ -146,16 +145,16 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class WavStreamWriter; @@ -35,7 +35,6 @@ public: WAVEncoder(); - }; |
|
From: <sv...@op...> - 2024-09-13 12:40:22
|
Author: manx Date: Fri Sep 13 14:40:10 2024 New Revision: 21586 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21586 Log: [Ref] openmpt/streamencoder: Untangle StreamEncoder dependencies and move to openmpt/streamencoder/. Added: trunk/OpenMPT/src/openmpt/streamencoder/ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoder.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoder.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderAU.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderAU.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderFLAC.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderMP3.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderOpus.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderRAW.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderRAW.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderVorbis.h trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp - copied, changed from r21585, trunk/OpenMPT/mptrack/StreamEncoderWAV.h Deleted: trunk/OpenMPT/mptrack/StreamEncoder.cpp trunk/OpenMPT/mptrack/StreamEncoder.h trunk/OpenMPT/mptrack/StreamEncoderAU.cpp trunk/OpenMPT/mptrack/StreamEncoderAU.h trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp trunk/OpenMPT/mptrack/StreamEncoderFLAC.h trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp trunk/OpenMPT/mptrack/StreamEncoderMP3.h trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp trunk/OpenMPT/mptrack/StreamEncoderOpus.h trunk/OpenMPT/mptrack/StreamEncoderRAW.cpp trunk/OpenMPT/mptrack/StreamEncoderRAW.h trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp trunk/OpenMPT/mptrack/StreamEncoderVorbis.h trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp trunk/OpenMPT/mptrack/StreamEncoderWAV.h Modified: trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua trunk/OpenMPT/build/premake/mpt-PluginBridge.lua trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua trunk/OpenMPT/build/premake/mpt-libopenmpt.lua trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua trunk/OpenMPT/build/premake/mpt-updatesigntool.lua trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/mptrack/Mod2wave.cpp trunk/OpenMPT/mptrack/Moddoc.cpp trunk/OpenMPT/mptrack/StreamEncoderSettings.h trunk/OpenMPT/mptrack/mod2wave.h Modified: trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua ============================================================================== --- trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -57,6 +57,8 @@ "../../src/openmpt/sounddevice/**.hpp", "../../src/openmpt/soundfile_write/**.cpp", "../../src/openmpt/soundfile_write/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } defines { "LIBOPENMPT_BUILD" } Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -41,6 +41,8 @@ "../../src/openmpt/soundfile_data/**.hpp", "../../src/openmpt/soundfile_write/**.cpp", "../../src/openmpt/soundfile_write/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } defines { "MODPLUG_TRACKER", "MPT_BUILD_WINESUPPORT" } if _OPTIONS["charset"] ~= "Unicode" then Modified: trunk/OpenMPT/build/premake/mpt-PluginBridge.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-PluginBridge.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-PluginBridge.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -33,6 +33,8 @@ "../../src/openmpt/soundfile_write/**.hpp", "../../src/openmpt/sounddevice/**.cpp", "../../src/openmpt/sounddevice/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } files { "../../pluginBridge/PluginBridge.rc", @@ -91,6 +93,8 @@ "../../src/openmpt/soundfile_write/**.hpp", "../../src/openmpt/sounddevice/**.cpp", "../../src/openmpt/sounddevice/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } files { "../../pluginBridge/PluginBridge.rc", Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -74,6 +74,8 @@ "../../src/openmpt/sounddevice/**.hpp", "../../src/openmpt/soundfile_write/**.cpp", "../../src/openmpt/soundfile_write/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } filter { "action:vs*" } resdefines { Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -60,6 +60,8 @@ "../../src/openmpt/sounddevice/**.hpp", "../../src/openmpt/soundfile_write/**.cpp", "../../src/openmpt/soundfile_write/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } filter { "action:vs*", "kind:SharedLib or ConsoleApp or WindowedApp" } resdefines { Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -84,6 +84,8 @@ "../../test/mpt_tests_uuid_namespace.cpp", "../../src/openmpt/sounddevice/**.cpp", "../../src/openmpt/sounddevice/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } if _OPTIONS["charset"] ~= "Unicode" then Modified: trunk/OpenMPT/build/premake/mpt-updatesigntool.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-updatesigntool.lua Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/premake/mpt-updatesigntool.lua Fri Sep 13 14:40:10 2024 (r21586) @@ -34,6 +34,8 @@ "../../src/openmpt/soundfile_write/**.hpp", "../../src/openmpt/sounddevice/**.cpp", "../../src/openmpt/sounddevice/**.hpp", + "../../src/openmpt/streamencoder/**.cpp", + "../../src/openmpt/streamencoder/**.hpp", } defines { "MODPLUG_TRACKER", "MPT_BUILD_UPDATESIGNTOOL" } if _OPTIONS["charset"] ~= "Unicode" then Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Fri Sep 13 14:40:10 2024 (r21586) @@ -867,15 +867,7 @@ <ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" /> <ClInclude Include="..\..\mptrack\SelectPluginDialog.h" /> <ClInclude Include="..\..\mptrack\Settings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoder.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" /> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" /> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h" /> <ClInclude Include="..\..\mptrack\TrackerSettings.h" /> <ClInclude Include="..\..\mptrack\TuningDialog.h" /> @@ -1199,6 +1191,14 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> @@ -1311,15 +1311,7 @@ <ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" /> <ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" /> <ClCompile Include="..\..\mptrack\Settings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" /> <ClCompile Include="..\..\mptrack\TrackerSettings.cpp" /> <ClCompile Include="..\..\mptrack\TuningDialog.cpp" /> @@ -1486,6 +1478,14 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Fri Sep 13 14:40:10 2024 (r21586) @@ -220,6 +220,9 @@ <Filter Include="src\openmpt\soundfile_write"> <UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier> </Filter> + <Filter Include="src\openmpt\streamencoder"> + <UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> @@ -561,33 +564,9 @@ <ClInclude Include="..\..\mptrack\Settings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoder.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1557,6 +1536,30 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> <ClInclude Include="..\..\test\PlaybackTest.h"> <Filter>test</Filter> </ClInclude> @@ -1889,33 +1892,9 @@ <ClCompile Include="..\..\mptrack\Settings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> @@ -2414,6 +2393,30 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> <ClCompile Include="..\..\test\PlaybackTest.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Fri Sep 13 14:40:10 2024 (r21586) @@ -867,15 +867,7 @@ <ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" /> <ClInclude Include="..\..\mptrack\SelectPluginDialog.h" /> <ClInclude Include="..\..\mptrack\Settings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoder.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" /> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" /> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h" /> <ClInclude Include="..\..\mptrack\TrackerSettings.h" /> <ClInclude Include="..\..\mptrack\TuningDialog.h" /> @@ -1199,6 +1191,14 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> @@ -1311,15 +1311,7 @@ <ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" /> <ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" /> <ClCompile Include="..\..\mptrack\Settings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" /> <ClCompile Include="..\..\mptrack\TrackerSettings.cpp" /> <ClCompile Include="..\..\mptrack\TuningDialog.cpp" /> @@ -1486,6 +1478,14 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Fri Sep 13 14:40:10 2024 (r21586) @@ -220,6 +220,9 @@ <Filter Include="src\openmpt\soundfile_write"> <UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier> </Filter> + <Filter Include="src\openmpt\streamencoder"> + <UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> @@ -561,33 +564,9 @@ <ClInclude Include="..\..\mptrack\Settings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoder.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1557,6 +1536,30 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> <ClInclude Include="..\..\test\PlaybackTest.h"> <Filter>test</Filter> </ClInclude> @@ -1889,33 +1892,9 @@ <ClCompile Include="..\..\mptrack\Settings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> @@ -2414,6 +2393,30 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> <ClCompile Include="..\..\test\PlaybackTest.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Fri Sep 13 14:40:10 2024 (r21586) @@ -867,15 +867,7 @@ <ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" /> <ClInclude Include="..\..\mptrack\SelectPluginDialog.h" /> <ClInclude Include="..\..\mptrack\Settings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoder.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" /> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" /> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h" /> <ClInclude Include="..\..\mptrack\TrackerSettings.h" /> <ClInclude Include="..\..\mptrack\TuningDialog.h" /> @@ -1199,6 +1191,14 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> @@ -1311,15 +1311,7 @@ <ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" /> <ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" /> <ClCompile Include="..\..\mptrack\Settings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" /> <ClCompile Include="..\..\mptrack\TrackerSettings.cpp" /> <ClCompile Include="..\..\mptrack\TuningDialog.cpp" /> @@ -1486,6 +1478,14 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Fri Sep 13 14:40:10 2024 (r21586) @@ -220,6 +220,9 @@ <Filter Include="src\openmpt\soundfile_write"> <UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier> </Filter> + <Filter Include="src\openmpt\streamencoder"> + <UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> @@ -561,33 +564,9 @@ <ClInclude Include="..\..\mptrack\Settings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoder.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1557,6 +1536,30 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> <ClInclude Include="..\..\test\PlaybackTest.h"> <Filter>test</Filter> </ClInclude> @@ -1889,33 +1892,9 @@ <ClCompile Include="..\..\mptrack\Settings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> @@ -2414,6 +2393,30 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> <ClCompile Include="..\..\test\PlaybackTest.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Fri Sep 13 14:40:10 2024 (r21586) @@ -867,15 +867,7 @@ <ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" /> <ClInclude Include="..\..\mptrack\SelectPluginDialog.h" /> <ClInclude Include="..\..\mptrack\Settings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoder.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" /> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" /> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h" /> <ClInclude Include="..\..\mptrack\TrackerSettings.h" /> <ClInclude Include="..\..\mptrack\TuningDialog.h" /> @@ -1199,6 +1191,14 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> @@ -1311,15 +1311,7 @@ <ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" /> <ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" /> <ClCompile Include="..\..\mptrack\Settings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" /> <ClCompile Include="..\..\mptrack\TrackerSettings.cpp" /> <ClCompile Include="..\..\mptrack\TuningDialog.cpp" /> @@ -1486,6 +1478,14 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Fri Sep 13 14:40:10 2024 (r21586) @@ -220,6 +220,9 @@ <Filter Include="src\openmpt\soundfile_write"> <UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier> </Filter> + <Filter Include="src\openmpt\streamencoder"> + <UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> @@ -561,33 +564,9 @@ <ClInclude Include="..\..\mptrack\Settings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoder.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h"> - <Filter>mptrack</Filter> - </ClInclude> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1557,6 +1536,30 @@ <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClInclude> <ClInclude Include="..\..\test\PlaybackTest.h"> <Filter>test</Filter> </ClInclude> @@ -1889,33 +1892,9 @@ <ClCompile Include="..\..\mptrack\Settings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp"> <Filter>mptrack</Filter> </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp"> - <Filter>mptrack</Filter> - </ClCompile> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp"> - <Filter>mptrack</Filter> - </ClCompile> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> @@ -2414,6 +2393,30 @@ <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp"> <Filter>src\openmpt\soundfile_write</Filter> </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp"> + <Filter>src\openmpt\streamencoder</Filter> + </ClCompile> <ClCompile Include="..\..\test\PlaybackTest.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Fri Sep 13 14:40:10 2024 (r21586) @@ -867,15 +867,7 @@ <ClInclude Include="..\..\mptrack\ScaleEnvPointsDlg.h" /> <ClInclude Include="..\..\mptrack\SelectPluginDialog.h" /> <ClInclude Include="..\..\mptrack\Settings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoder.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderRAW.h" /> <ClInclude Include="..\..\mptrack\StreamEncoderSettings.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderVorbis.h" /> - <ClInclude Include="..\..\mptrack\StreamEncoderWAV.h" /> <ClInclude Include="..\..\mptrack\TempoSwingDialog.h" /> <ClInclude Include="..\..\mptrack\TrackerSettings.h" /> <ClInclude Include="..\..\mptrack\TuningDialog.h" /> @@ -1199,6 +1191,14 @@ <ClInclude Include="..\..\src\openmpt\soundfile_data\tags.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_data\wav.hpp" /> <ClInclude Include="..\..\src\openmpt\soundfile_write\wav_write.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoder.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.hpp" /> + <ClInclude Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.hpp" /> <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> @@ -1311,15 +1311,7 @@ <ClCompile Include="..\..\mptrack\ScaleEnvPointsDlg.cpp" /> <ClCompile Include="..\..\mptrack\SelectPluginDialog.cpp" /> <ClCompile Include="..\..\mptrack\Settings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoder.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderAU.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderFLAC.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderMP3.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderOpus.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderRAW.cpp" /> <ClCompile Include="..\..\mptrack\StreamEncoderSettings.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderVorbis.cpp" /> - <ClCompile Include="..\..\mptrack\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\mptrack\TempoSwingDialog.cpp" /> <ClCompile Include="..\..\mptrack\TrackerSettings.cpp" /> <ClCompile Include="..\..\mptrack\TuningDialog.cpp" /> @@ -1486,6 +1478,14 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> <ClCompile Include="..\..\src\openmpt\soundfile_write\wav_write.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoder.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderAU.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderFLAC.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderMP3.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderOpus.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderRAW.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderVorbis.cpp" /> + <ClCompile Include="..\..\src\openmpt\streamencoder\StreamEncoderWAV.cpp" /> <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Wed Sep 11 11:17:31 2024 (r21585) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Fri Sep 13 14:40:10 2024 (r21586) @@ -220,6 +220,9 @@ <Filter Include="src\openmpt\soundfile_write"> <UniqueIdentifier>{21750652-8D82-3438-1669-3023827500EF}</UniqueIdentifier> </Filter> + <Filter Include="src\openmpt\streamencoder"> + <UniqueIdentifier>{BA0C6BE9-26CF-9E73-6F7F-2D00DB807751}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> @@ -561,33 +564,9 @@ <ClInclude Include="..\..\mptrack\Settings.h"> <Filter>mptrack</Filter> </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoder.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderAU.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderFLAC.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderMP3.h"> - <Filter>mptrack</Filter> - </ClInclude> - <ClInclude Include="..\..\mptrack\StreamEncoderOpus.h"> - <Filter... [truncated message content] |
|
From: <sv...@op...> - 2024-09-11 09:17:43
|
Author: manx Date: Wed Sep 11 11:17:31 2024 New Revision: 21585 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21585 Log: [Var] python: Update to v3.12.6. Modified: branches/OpenMPT-1.31/build/download_externals.cmd Modified: branches/OpenMPT-1.31/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.cmd Wed Sep 11 11:17:23 2024 (r21584) +++ branches/OpenMPT-1.31/build/download_externals.cmd Wed Sep 11 11:17:31 2024 (r21585) @@ -44,7 +44,7 @@ call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe" d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.5/python-3.12.5-embed-amd64.zip" "build\externals\python-3.12.5-embed-amd64.zip" d1f478a24c16aa46ca7950a13881563c46301bd698f614077a6b2076d2cea49d6cf0555515b5ead94be43f95cf9bc6e30d1b6ded77555b0f42d2f4c140ec6a96 11058677 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-amd64.zip" "build\externals\python-3.12.6-embed-amd64.zip" 43e9eab6fce7e62f1badf478706e3df7f65a9bb0fdff2ee01f71c65425acd8d73e4e0dcc64a6ee59a7d934be7271a4f0b9fe3e0da62a5ba636663f628bd7fbd7 11061146 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar" "build\externals\innounp050.rar" dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 141621 || goto error @@ -73,7 +73,7 @@ call build\scriptlib\unpack.cmd "include\winamp" "build\externals\WA5.55_SDK.exe" "." || goto error call build\scriptlib\unpack.cmd "include\xmplay" "build\externals\xmp-sdk.zip" "." || goto error -call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.5-embed-amd64.zip" "." || goto error +call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.6-embed-amd64.zip" "." || goto error call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup" || goto error |
|
From: <sv...@op...> - 2024-09-11 09:17:35
|
Author: manx Date: Wed Sep 11 11:17:23 2024 New Revision: 21584 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21584 Log: [Var] python: Update to v3.12.6. Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Tue Sep 10 14:30:31 2024 (r21583) +++ trunk/OpenMPT/build/download_externals.cmd Wed Sep 11 11:17:23 2024 (r21584) @@ -47,7 +47,7 @@ call build\scriptlib\unpack.cmd "include\winamp" "build\externals\WA5.55_SDK.exe" "." || goto error call build\scriptlib\unpack.cmd "include\xmplay" "build\externals\xmp-sdk.zip" "." || goto error -call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.5-embed-amd64.zip" "." || goto error +call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.6-embed-amd64.zip" "." || goto error call :killdir "build\tools\innosetup" || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Tue Sep 10 14:30:31 2024 (r21583) +++ trunk/OpenMPT/build/download_externals.txt Wed Sep 11 11:17:23 2024 (r21584) @@ -4,7 +4,7 @@ "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" -"build/externals/python-3.12.5-embed-amd64.zip" 11058677 d1f478a24c16aa46ca7950a13881563c46301bd698f614077a6b2076d2cea49d6cf0555515b5ead94be43f95cf9bc6e30d1b6ded77555b0f42d2f4c140ec6a96 "https://www.python.org/ftp/python/3.12.5/python-3.12.5-embed-amd64.zip" +"build/externals/python-3.12.6-embed-amd64.zip" 11061146 43e9eab6fce7e62f1badf478706e3df7f65a9bb0fdff2ee01f71c65425acd8d73e4e0dcc64a6ee59a7d934be7271a4f0b9fe3e0da62a5ba636663f628bd7fbd7 "https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "build/externals/innosetup-6.3.3.exe" 5634744 785e7cdad84da42ddfc94f8e20b7150a92fbca1904cfa4d7e23f68b874fba134e9c91a1fb5a8291e7e334f57c1063061d3e8496a2d9e7c4d9415ea9f12a3522e "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe" "https://files.innosetup.nl/innosetup-6.3.3.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" |
|
From: <sv...@op...> - 2024-09-10 12:30:42
|
Author: sagamusix Date: Tue Sep 10 14:30:31 2024 New Revision: 21583 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21583 Log: [Fix] r21578 broke tempo calculation in GetLength in yet another way... Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Tue Sep 10 12:02:39 2024 (r21582) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Tue Sep 10 14:30:31 2024 (r21583) @@ -764,6 +764,7 @@ if(tempo >= GetMinimumTempoParam(GetType())) { + playState.m_flags.set(SONG_FIRSTTICK, !m_playBehaviour[kMODTempoOnSecondTick]); SetTempo(playState, tempo, false); } else { |
|
From: <sv...@op...> - 2024-09-10 10:02:51
|
Author: manx Date: Tue Sep 10 12:02:39 2024 New Revision: 21582 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21582 Log: [Fix] build: Makefile: Fix typo causing libopenmpt-test to not get rebuilt when needed. Modified: trunk/OpenMPT/Makefile Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Tue Sep 10 09:12:27 2024 (r21581) +++ trunk/OpenMPT/Makefile Tue Sep 10 12:02:39 2024 (r21582) @@ -1407,7 +1407,7 @@ LIBOPENMPTTEST_C_SOURCES += \ LIBOPENMPTTEST_OBJECTS += $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test$(FLAVOUR_O).o) $(LIBOPENMPTTEST_C_SOURCES:.c=.test$(FLAVOUR_O).o) -LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_OBJCECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) +LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d) ALL_OBJECTS += $(LIBOPENMPTTEST_OBJECTS) ALL_DEPENDS += $(LIBOPENMPTTEST_DEPENDS) |
|
From: <sv...@op...> - 2024-09-10 07:12:38
|
Author: sagamusix Date: Tue Sep 10 09:12:27 2024 New Revision: 21581 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21581 Log: [Ref] Silence warning. Modified: trunk/OpenMPT/soundlib/Load_okt.cpp Modified: trunk/OpenMPT/soundlib/Load_okt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_okt.cpp Mon Sep 9 23:19:15 2024 (r21580) +++ trunk/OpenMPT/soundlib/Load_okt.cpp Tue Sep 10 09:12:27 2024 (r21581) @@ -263,7 +263,7 @@ } else if(row < rows - 1) { // Retry on next row - sndFile.Patterns[pat].GetpModCommand(row + 1, chn + pairedChn[chn])->SetEffectCommand(m); + sndFile.Patterns[pat].GetpModCommand(row + 1, static_cast<CHANNELINDEX>(chn + pairedChn[chn]))->SetEffectCommand(m); } } break; |
|
From: <sv...@op...> - 2024-09-09 21:19:26
|
Author: sagamusix Date: Mon Sep 9 23:19:15 2024 New Revision: 21580 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21580 Log: [Imp] OKT: Don't drop global commands when setting paired channel volume, and try to write channel volume on the next row in this situation. Fixes tempo at start of Orbit.okt, https://www.un4seen.com/forum/?topic=15448.msg143684#msg143684 Modified: trunk/OpenMPT/soundlib/Load_okt.cpp Modified: trunk/OpenMPT/soundlib/Load_okt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_okt.cpp Mon Sep 9 23:00:49 2024 (r21579) +++ trunk/OpenMPT/soundlib/Load_okt.cpp Mon Sep 9 23:19:15 2024 (r21580) @@ -131,8 +131,7 @@ // Default volume only works on raw Paula channels if(pairedChn[chn] && sample.nVolume < 256) { - m.volcmd = VOLCMD_VOLUME; - m.vol = 64; + m.SetVolumeCommand(VOLCMD_VOLUME, 64); } // If channel and sample type don't match, stop this channel (add 100 to the instrument number to make it understandable what happened during import) if((sample.cues[0] == 1 && pairedChn[chn] != 0) || (sample.cues[0] == 0 && pairedChn[chn] == 0)) @@ -150,105 +149,72 @@ case 1: // 1 Portamento Down (Period) if(param) { - m.command = CMD_PORTAMENTOUP; - m.param = param; + m.SetEffectCommand(CMD_PORTAMENTOUP, param); } break; case 2: // 2 Portamento Up (Period) if(param) - { - m.command = CMD_PORTAMENTODOWN; - m.param = param; - } + m.SetEffectCommand(CMD_PORTAMENTODOWN, param); break; case 10: // A Arpeggio 1 (down, orig, up) if(param) - { - m.command = CMD_ARPEGGIO; - m.param = (param & 0x0F) | (InvertArpeggioParam(param >> 4) << 4); - } + m.SetEffectCommand(CMD_ARPEGGIO, (param & 0x0F) | (InvertArpeggioParam(param >> 4) << 4)); break; case 11: // B Arpeggio 2 (orig, up, orig, down) if(param) - { - m.command = CMD_ARPEGGIO; - m.param = (param & 0xF0) | InvertArpeggioParam(param & 0x0F); - } + m.SetEffectCommand(CMD_ARPEGGIO, (param & 0xF0) | InvertArpeggioParam(param & 0x0F)); break; // This one is close enough to "standard" arpeggio -- I think! case 12: // C Arpeggio 3 (up, up, orig) if(param) - { - m.command = CMD_ARPEGGIO; - m.param = param; - } + m.SetEffectCommand(CMD_ARPEGGIO, param); break; case 13: // D Slide Down (Notes) if(param) - { - m.command = CMD_NOTESLIDEDOWN; - m.param = 0x10 | std::min(uint8(0x0F), param); - } + m.SetEffectCommand(CMD_NOTESLIDEDOWN, 0x10 | std::min(uint8(0x0F), param)); break; case 30: // U Slide Up (Notes) if(param) - { - m.command = CMD_NOTESLIDEUP; - m.param = 0x10 | std::min(uint8(0x0F), param); - } + m.SetEffectCommand(CMD_NOTESLIDEUP, 0x10 | std::min(uint8(0x0F), param)); break; // Fine Slides are only implemented for libopenmpt. For OpenMPT, // sliding every 5 (non-note) ticks kind of works (at least at // speed 6), but implementing separate (format-agnostic) fine slide commands would of course be better. case 21: // L Slide Down Once (Notes) if(param) - { - m.command = CMD_NOTESLIDEDOWN; - m.param = 0x50 | std::min(uint8(0x0F), param); - } + m.SetEffectCommand(CMD_NOTESLIDEDOWN, 0x50 | std::min(uint8(0x0F), param)); break; case 17: // H Slide Up Once (Notes) if(param) - { - m.command = CMD_NOTESLIDEUP; - m.param = 0x50 | std::min(uint8(0x0F), param); - } + m.SetEffectCommand(CMD_NOTESLIDEUP, 0x50 | std::min(uint8(0x0F), param)); break; case 15: // F Set Filter <>00:ON - m.command = CMD_MODCMDEX; - m.param = !!param; + m.SetEffectCommand(CMD_MODCMDEX, !!param); break; case 25: // P Pos Jump - m.command = CMD_POSITIONJUMP; - m.param = param; + m.SetEffectCommand(CMD_POSITIONJUMP, param); break; case 27: // R Release sample (apparently not listed in the help!) - m.Clear(); m.note = NOTE_KEYOFF; + m.instr = 0; break; case 28: // S Speed if(param < 0x20) - { - m.command = CMD_SPEED; - m.param = param; - } + m.SetEffectCommand(CMD_SPEED, param); break; case 31: // V Volume // Volume on mixed channels is permanent, on hardware channels it behaves like in regular MODs if(param & 0x0F) - { - m.command = pairedChn[chn] ? CMD_CHANNELVOLSLIDE : CMD_VOLUMESLIDE; - m.param = param & 0x0F; - } + m.SetEffectCommand(pairedChn[chn] ? CMD_CHANNELVOLSLIDE : CMD_VOLUMESLIDE, param & 0x0F); switch(param >> 4) { @@ -260,13 +226,11 @@ case 0: case 1: case 2: case 3: if(pairedChn[chn]) { - m.command = CMD_CHANNELVOLUME; - m.param = param; + m.SetEffectCommand(CMD_CHANNELVOLUME, param); } else { - m.volcmd = VOLCMD_VOLUME; - m.vol = param; - m.command = CMD_NONE; + m.SetVolumeCommand(VOLCMD_VOLUME, param); + m.SetEffectCommand(oldCmd, oldParam); } break; case 5: // Normal slide up @@ -280,7 +244,7 @@ break; default: // Junk. - m.command = CMD_NONE; + m.SetEffectCommand(oldCmd, oldParam); break; } @@ -293,7 +257,14 @@ { other.SetVolumeCommand(volCmd); } - other.SetEffectCommand(m); + if(ModCommand::GetEffectWeight(other.command) < ModCommand::GetEffectWeight(m.command)) + { + other.SetEffectCommand(m); + } else if(row < rows - 1) + { + // Retry on next row + sndFile.Patterns[pat].GetpModCommand(row + 1, chn + pairedChn[chn])->SetEffectCommand(m); + } } break; |
|
From: <sv...@op...> - 2024-09-09 21:01:01
|
Author: sagamusix Date: Mon Sep 9 23:00:49 2024 New Revision: 21579 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21579 Log: [Fix] 669: r21418 completely messed up effect commands. Modified: trunk/OpenMPT/soundlib/Load_669.cpp Modified: trunk/OpenMPT/soundlib/Load_669.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_669.cpp Mon Sep 9 22:05:44 2024 (r21578) +++ trunk/OpenMPT/soundlib/Load_669.cpp Mon Sep 9 23:00:49 2024 (r21579) @@ -147,9 +147,10 @@ //m_SongFlags.set(SONG_LINEARSLIDES); #endif // MODPLUG_TRACKER + const bool isExtended = !memcmp(fileHeader.magic, "JN", 2); m_modFormat.formatName = UL_("Composer 669"); m_modFormat.type = UL_("669"); - m_modFormat.madeWithTracker = !memcmp(fileHeader.magic, "if", 2) ? UL_("Composer 669") : UL_("UNIS 669"); + m_modFormat.madeWithTracker = isExtended ? UL_("UNIS 669") : UL_("Composer 669"); m_modFormat.charset = mpt::Charset::CP437; m_nSamples = fileHeader.samples; @@ -215,7 +216,6 @@ uint8 note = noteInstr >> 2; uint8 instr = ((noteInstr & 0x03) << 4) | (instrVol >> 4); uint8 vol = instrVol & 0x0F; - uint8 command = effect[chn] >> 4; if(noteInstr < 0xFE) { m->note = note + 36 + NOTE_MIN; @@ -229,41 +229,26 @@ } if(effParam != 0xFF) - { effect[chn] = effParam; - } - if((effParam & 0x0F) == 0 && effParam != 0x30) - { - // A param value of 0 resets the effect. - effect[chn] = 0xFF; - if(command < 3) - m->SetEffectCommand(effTrans[command], 0); - } if(effect[chn] == 0xFF) - { continue; - } - m->param = effect[chn] & 0x0F; + uint8 command = effect[chn] >> 4; // Weird stuff happening in corehop.669 with effects > 8... they seem to do the same thing as if the high bit wasn't set, but the sample also behaves strangely. - if(command < static_cast<uint8>(std::size(effTrans))) + if(command < mpt::array_size<decltype(effTrans)>::size) { -#if MPT_COMPILER_MSVC -#pragma warning(push) -// false-positive -#pragma warning(disable:6385) // Reading invalid data from 'effTrans'. -#endif - m->command = effTrans[command]; -#if MPT_COMPILER_MSVC -#pragma warning(pop) -#endif + m->SetEffectCommand(effTrans[command], effect[chn] & 0x0F); } else { m->command = CMD_NONE; continue; } + // Currently not implemented as auto-slides + if(m->command != CMD_PANNINGSLIDE) + effect[chn] = 0xFF; + // Fix some commands switch(command) { @@ -276,7 +261,6 @@ #else m->param |= 0x20; #endif - effect[chn] = 0xFF; break; case 4: @@ -290,7 +274,6 @@ case 5: // F - set tempo // TODO: param 0 is a "super fast tempo" in Unis 669 mode (?) - effect[chn] = 0xFF; break; case 6: @@ -309,6 +292,11 @@ m->command = CMD_NONE; } break; + + case 7: + // H- slot retrig ("This command rapidly fires 4 slots. The command parameter specifies the speed at which to do it. The speed difference across the values is exponential.") + if(!m->IsNote() || !isExtended) + m->command = CMD_NONE; } } } |
|
From: <sv...@op...> - 2024-09-09 20:05:51
|
Author: sagamusix Date: Mon Sep 9 22:05:44 2024 New Revision: 21578 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21578 Log: [Fix] Tempo limits were inconsistent between GetLength and regular module playback after r21572. Fixes song length retrieval of OSS.Mad Frenchman (https://www.un4seen.com/forum/?topic=15448.msg143478#msg143478). Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp trunk/OpenMPT/soundlib/Sndfile.h Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Sep 9 20:12:14 2024 (r21577) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Sep 9 22:05:44 2024 (r21578) @@ -613,6 +613,7 @@ // ProTracker MODs with VBlank timing: All Fxx parameters set the tick count. if(p->param != 0) SetSpeed(playState, p->param); } + // Regular tempo handled below break; case CMD_S3MCMDEX: @@ -756,42 +757,22 @@ if(!m_playBehaviour[kMODVBlankTiming]) { TEMPO tempo(CalculateXParam(playState.m_nPattern, playState.m_nRow, nChn), 0); - if ((adjustMode & eAdjust) && (GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT))) + if(GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT)) { if (tempo.GetInt()) chn.nOldTempo = static_cast<uint8>(tempo.GetInt()); else tempo.Set(chn.nOldTempo); } - const auto &specs = GetModSpecifications(); if(tempo >= GetMinimumTempoParam(GetType())) { -#if MPT_MSVC_BEFORE(2019, 0) - // Work-around for VS2017 /std:c++17 /permissive- - // which fails to find operator < for templated user types inside std::min. - playState.m_nMusicTempo.SetRaw(std::min(tempo.GetRaw(), specs.GetTempoMax().GetRaw())); -#else - playState.m_nMusicTempo = std::min(tempo, specs.GetTempoMax()); -#endif + SetTempo(playState, tempo, false); } else { // Tempo Slide - TEMPO tempoDiff((tempo.GetInt() & 0x0F) * nonRowTicks, 0); - if ((tempo.GetInt() & 0xF0) == 0x10) - { - playState.m_nMusicTempo += tempoDiff; - } else - { - if(tempoDiff < playState.m_nMusicTempo) - playState.m_nMusicTempo -= tempoDiff; - else - playState.m_nMusicTempo.Set(0); - } - - TEMPO tempoMin = specs.GetTempoMin(), tempoMax = specs.GetTempoMax(); - if(m_playBehaviour[kTempoClamp]) // clamp tempo correctly in compatible mode + playState.m_flags.reset(SONG_FIRSTTICK); + for(uint32 i = 0; i < nonRowTicks; i++) { - tempoMax.Set(255); + SetTempo(playState, tempo, false); } - Limit(playState.m_nMusicTempo, tempoMin, tempoMax); } } break; @@ -3391,7 +3372,7 @@ { if (param) chn.nOldTempo = static_cast<ModCommand::PARAM>(param); else param = chn.nOldTempo; } - SetTempo(TEMPO(param, 0)); + SetTempo(m_PlayState, TEMPO(param, 0)); } break; @@ -6352,7 +6333,7 @@ } -void CSoundFile::SetTempo(TEMPO param, bool setFromUI) +void CSoundFile::SetTempo(PlayState &playState, TEMPO param, bool setFromUI) const { const CModSpecifications &specs = GetModSpecifications(); @@ -6369,24 +6350,24 @@ if(setFromUI) { // Set tempo from UI - ignore slide commands and such. - m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), maxTempo); - } else if(param >= minTempo && m_PlayState.m_flags[SONG_FIRSTTICK] == !m_playBehaviour[kMODTempoOnSecondTick]) + playState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), maxTempo); + } else if(param >= minTempo && playState.m_flags[SONG_FIRSTTICK] == !m_playBehaviour[kMODTempoOnSecondTick]) { // ProTracker sets the tempo after the first tick. // Note: The case of one tick per row is handled in ProcessRow() instead. // Test case: TempoChange.mod - m_PlayState.m_nMusicTempo = std::min(param, maxTempo); - } else if(param < minTempo && !m_PlayState.m_flags[SONG_FIRSTTICK]) + playState.m_nMusicTempo = std::min(param, maxTempo); + } else if(param < minTempo && !playState.m_flags[SONG_FIRSTTICK]) { // Tempo Slide TEMPO tempDiff(param.GetInt() & 0x0F, 0); if((param.GetInt() & 0xF0) == 0x10) - m_PlayState.m_nMusicTempo += tempDiff; + playState.m_nMusicTempo += tempDiff; else - m_PlayState.m_nMusicTempo -= tempDiff; + playState.m_nMusicTempo -= tempDiff; TEMPO tempoMin = specs.GetTempoMin(); - Limit(m_PlayState.m_nMusicTempo, tempoMin, maxTempo); + Limit(playState.m_nMusicTempo, tempoMin, maxTempo); } } Modified: trunk/OpenMPT/soundlib/Sndfile.h ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.h Mon Sep 9 20:12:14 2024 (r21577) +++ trunk/OpenMPT/soundlib/Sndfile.h Mon Sep 9 22:05:44 2024 (r21578) @@ -1015,7 +1015,8 @@ // Channel Effects void KeyOff(ModChannel &chn) const; // Global Effects - void SetTempo(TEMPO param, bool setAsNonModcommand = false); + void SetTempo(TEMPO param, bool setAsNonModcommand = false) { SetTempo(m_PlayState, param, setAsNonModcommand); } + void SetTempo(PlayState &playState, TEMPO param, bool setAsNonModcommand = false) const; void SetSpeed(PlayState &playState, uint32 param) const; static TEMPO ConvertST2Tempo(uint8 tempo); |
|
From: <sv...@op...> - 2024-09-09 18:12:27
|
Author: sagamusix Date: Mon Sep 9 20:12:14 2024 New Revision: 21577 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21577 Log: [Fix] PTM: PolyTracker uses square root panning like FT2, and has a bug where the leftmost and rightmost positions play the sample without any attenuation on the left and right channels. Fixes bass balance in "BugFixed (The Song)" by Vic (https://www.un4seen.com/forum/?topic=15448.msg143684#msg143684). Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp trunk/OpenMPT/soundlib/Sndmix.cpp Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ptm.cpp Mon Sep 9 12:37:58 2024 (r21576) +++ trunk/OpenMPT/soundlib/Load_ptm.cpp Mon Sep 9 20:12:14 2024 (r21577) @@ -175,6 +175,7 @@ m_modFormat.madeWithTracker = MPT_UFORMAT("PolyTracker {}.{}")(fileHeader.versionHi.get(), mpt::ufmt::hex0<2>(fileHeader.versionLo.get())); m_modFormat.charset = mpt::Charset::CP437; + SetMixLevels(MixLevels::CompatibleFT2); m_SongFlags = SONG_ITCOMPATGXX | SONG_ITOLDEFFECTS; m_nSamples = std::min(static_cast<SAMPLEINDEX>(fileHeader.numSamples), static_cast<SAMPLEINDEX>(MAX_SAMPLES - 1)); ReadOrderFromArray(Order(), fileHeader.orders, fileHeader.numOrders, 0xFF, 0xFE); @@ -265,8 +266,7 @@ { case CMD_PANNING8: // Don't be surprised about the strange formula, this is directly translated from original disassembly... - m.command = CMD_S3MCMDEX; - m.param = 0x80 | ((std::max<uint8>(m.param >> 3, 1u) - 1u) & 0x0F); + m.SetEffectCommand(CMD_S3MCMDEX, static_cast<ModCommand::PARAM>(0x80 | ((std::max<uint8>(m.param >> 3, 1u) - 1u) & 0x0F))); break; case CMD_GLOBALVOLUME: m.param = std::min(m.param, uint8(0x40)) * 2u; @@ -277,8 +277,7 @@ } if(b & 0x80) { - m.volcmd = VOLCMD_VOLUME; - m.vol = file.ReadUint8(); + m.SetVolumeCommand(VOLCMD_VOLUME, file.ReadUint8()); } } } Modified: trunk/OpenMPT/soundlib/Sndmix.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndmix.cpp Mon Sep 9 12:37:58 2024 (r21576) +++ trunk/OpenMPT/soundlib/Sndmix.cpp Mon Sep 9 20:12:14 2024 (r21577) @@ -2484,15 +2484,10 @@ { int32 pan = (m_MixerSettings.gnChannels >= 2) ? Clamp(chn.nRealPan, 0, 256) : 128; - int32 realvol; - if(m_PlayConfig.getUseGlobalPreAmp()) - { - realvol = (chn.nRealVolume * kChnMasterVol) / 128; - } else - { - // Extra attenuation required here if we're bypassing pre-amp. - realvol = (chn.nRealVolume * kChnMasterVol) / 256; - } + int32 realvol = (chn.nRealVolume * kChnMasterVol) / 128; + // Extra attenuation required here if we're bypassing pre-amp. + if(!m_PlayConfig.getUseGlobalPreAmp()) + realvol /= 2; const PanningMode panningMode = m_PlayConfig.getPanningMode(); if(panningMode == PanningMode::SoftPanning || (panningMode == PanningMode::Undetermined && (m_MixerSettings.MixerFlags & SNDMIX_SOFTPANNING))) @@ -2513,10 +2508,19 @@ // you can never truly achieve 100% right panning in FT2, only 100% left. // Test case: FT2PanLaw.xm LimitMax(pan, 255); - const int panL = pan > 0 ? XMPanningTable[256 - pan] : 65536; - const int panR = XMPanningTable[pan]; - chn.newLeftVol = (realvol * panL) / 65536; - chn.newRightVol = (realvol * panR) / 65536; + + // PolyTracker also uses square root panning, but there's a bug where the leftmost and rightmost pan positions play the sample centered, without any attenuation. + if(GetType() == MOD_TYPE_PTM && (pan == 0 || pan == 255)) + { + chn.newLeftVol = realvol; + chn.newRightVol = realvol; + } else + { + const int panL = pan > 0 ? XMPanningTable[256 - pan] : 65536; + const int panR = XMPanningTable[pan]; + chn.newLeftVol = (realvol * panL) / 65536; + chn.newRightVol = (realvol * panR) / 65536; + } } else { chn.newLeftVol = (realvol * (256 - pan)) / 256; |
|
From: <sv...@op...> - 2024-09-09 10:38:09
|
Author: manx Date: Mon Sep 9 12:37:58 2024 New Revision: 21576 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21576 Log: [Fix] build: CI: AppVeyor: Fix 32bit arm build. Modified: trunk/OpenMPT/.appveyor.yml Modified: trunk/OpenMPT/.appveyor.yml ============================================================================== --- trunk/OpenMPT/.appveyor.yml Mon Sep 9 08:52:32 2024 (r21575) +++ trunk/OpenMPT/.appveyor.yml Mon Sep 9 12:37:58 2024 (r21576) @@ -177,7 +177,7 @@ } Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win10 x86' Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win10 amd64' - Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win10 arm' + Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win8 arm' Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win10 arm64' Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win7 x86' Get-AppVeyorArtifacts OpenMPT openmpt -Token $env:OPENMPT_APPVEYOR_API_TOKEN -JobName 'VS2022 Win7 amd64' |
|
From: <sv...@op...> - 2024-09-09 06:52:38
|
Author: manx Date: Mon Sep 9 08:52:32 2024 New Revision: 21575 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21575 Log: [Fix] build: CI: AppVeyor: Fix 32bit arm build. Modified: trunk/OpenMPT/.appveyor.yml Modified: trunk/OpenMPT/.appveyor.yml ============================================================================== --- trunk/OpenMPT/.appveyor.yml Sun Sep 8 17:55:26 2024 (r21574) +++ trunk/OpenMPT/.appveyor.yml Mon Sep 9 08:52:32 2024 (r21575) @@ -35,10 +35,10 @@ MPT_APPVEYOR_TARGET: win10 MPT_APPVEYOR_ARCH: amd64 MPT_APPVEYOR_ARCH_CONFIG: x64 - - job_name: VS2022 Win10 arm + - job_name: VS2022 Win8 arm job_group: Builds MPT_APPVEYOR_VS: vs2022 - MPT_APPVEYOR_TARGET: win10 + MPT_APPVEYOR_TARGET: win8 MPT_APPVEYOR_ARCH: arm MPT_APPVEYOR_ARCH_CONFIG: ARM - job_name: VS2022 Win10 arm64 |
|
From: <sv...@op...> - 2024-09-08 15:55:33
|
Author: sagamusix Date: Sun Sep 8 17:55:26 2024 New Revision: 21574 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21574 Log: [Mod] Add FST to list of recognized file extensions. AMP uses this extension for multichannel MODs. Patch partially by cs127, https://github.com/OpenMPT/openmpt/pull/22 Modified: trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss trunk/OpenMPT/installer/filetypes-multi-arch.iss trunk/OpenMPT/soundlib/Tables.cpp Modified: trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss ============================================================================== --- trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss Sun Sep 8 13:44:52 2024 (r21573) +++ trunk/OpenMPT/installer/filetypes-multi-arch-per-arch-retro.iss Sun Sep 8 17:55:26 2024 (r21574) @@ -61,6 +61,7 @@ Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".etx"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component} +Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".ftm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gmc"; ValueData: {#OpenMPTFile}; Components: {#Component} Modified: trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss ============================================================================== --- trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss Sun Sep 8 13:44:52 2024 (r21573) +++ trunk/OpenMPT/installer/filetypes-multi-arch-per-arch.iss Sun Sep 8 17:55:26 2024 (r21574) @@ -61,6 +61,7 @@ Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".etx"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component} +Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".ftm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gmc"; ValueData: {#OpenMPTFile}; Components: {#Component} Modified: trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss ============================================================================== --- trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss Sun Sep 8 13:44:52 2024 (r21573) +++ trunk/OpenMPT/installer/filetypes-multi-arch-retro.iss Sun Sep 8 17:55:26 2024 (r21574) @@ -36,6 +36,7 @@ Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".etx"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: "" +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".ftm"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gmc"; ValueData: "" Modified: trunk/OpenMPT/installer/filetypes-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/filetypes-multi-arch.iss Sun Sep 8 13:44:52 2024 (r21573) +++ trunk/OpenMPT/installer/filetypes-multi-arch.iss Sun Sep 8 17:55:26 2024 (r21574) @@ -36,6 +36,7 @@ Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".etx"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: "" +Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".ftm"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gmc"; ValueData: "" Modified: trunk/OpenMPT/soundlib/Tables.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Tables.cpp Sun Sep 8 13:44:52 2024 (r21573) +++ trunk/OpenMPT/soundlib/Tables.cpp Sun Sep 8 17:55:26 2024 (r21574) @@ -75,6 +75,7 @@ { UL_("EasyTrax"), "etx" }, { UL_("Farandole Composer"), "far" }, { UL_("FM Tracker"), "fmt" }, + { UL_("ProTracker"), "fst" }, { UL_("Face The Music"), "ftm" }, { UL_("Imago Orpheus"), "imf" }, { UL_("Images Music System"), "ims" }, |
|
From: <sv...@op...> - 2024-09-08 11:44:59
|
Author: sagamusix Date: Sun Sep 8 13:44:52 2024 New Revision: 21573 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21573 Log: Merged revision(s) 21572 from trunk/OpenMPT: [Imp] MED: Tempo commands > 255 BPM were not imported properly if the files was imported as MOD instead of XM. Fixes OSS.Mad Frenchman (https://www.un4seen.com/forum/?topic=15448.msg143478#msg143478). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Modified: branches/OpenMPT-1.31/soundlib/Snd_fx.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Sun Sep 8 13:44:02 2024 (r21572) +++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Sun Sep 8 13:44:52 2024 (r21573) @@ -3216,18 +3216,16 @@ if(m_playBehaviour[kMODVBlankTiming]) { // ProTracker MODs with VBlank timing: All Fxx parameters set the tick count. - if(m_SongFlags[SONG_FIRSTTICK] && param != 0) SetSpeed(m_PlayState, param); - break; - } + if(m_SongFlags[SONG_FIRSTTICK] && param != 0) + SetSpeed(m_PlayState, param); + } else { param = CalculateXParam(m_PlayState.m_nPattern, m_PlayState.m_nRow, nChn); - if (GetType() & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT)) + if (GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT)) { if (param) chn.nOldTempo = static_cast<ModCommand::PARAM>(param); else param = chn.nOldTempo; } - TEMPO t(param, 0); - LimitMax(t, GetModSpecifications().GetTempoMax()); - SetTempo(t); + SetTempo(TEMPO(param, 0)); } break; @@ -5978,17 +5976,24 @@ // Anything lower than the minimum tempo is considered to be a tempo slide const TEMPO minTempo = GetMinimumTempoParam(GetType()); + TEMPO maxTempo = specs.GetTempoMax(); + // MED files may be imported with #xx parameter extension for tempos above 255, but they may be imported as either MOD or XM. + // As regular MOD files cannot contain effect #xx, the tempo parameter cannot exceed 255 anyway, so we simply ignore their max tempo in CModSpecifications here. + if(!(GetType() & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT))) + maxTempo = GetModSpecifications(MOD_TYPE_MPT).GetTempoMax(); + if(m_playBehaviour[kTempoClamp]) + maxTempo.Set(255); if(setFromUI) { // Set tempo from UI - ignore slide commands and such. - m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), specs.GetTempoMax()); + m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), maxTempo); } else if(param >= minTempo && m_SongFlags[SONG_FIRSTTICK] == !m_playBehaviour[kMODTempoOnSecondTick]) { // ProTracker sets the tempo after the first tick. // Note: The case of one tick per row is handled in ProcessRow() instead. // Test case: TempoChange.mod - m_PlayState.m_nMusicTempo = std::min(param, specs.GetTempoMax()); + m_PlayState.m_nMusicTempo = std::min(param, maxTempo); } else if(param < minTempo && !m_SongFlags[SONG_FIRSTTICK]) { // Tempo Slide @@ -5998,12 +6003,8 @@ else m_PlayState.m_nMusicTempo -= tempDiff; - TEMPO tempoMin = specs.GetTempoMin(), tempoMax = specs.GetTempoMax(); - if(m_playBehaviour[kTempoClamp]) // clamp tempo correctly in compatible mode - { - tempoMax.Set(255); - } - Limit(m_PlayState.m_nMusicTempo, tempoMin, tempoMax); + TEMPO tempoMin = specs.GetTempoMin(); + Limit(m_PlayState.m_nMusicTempo, tempoMin, maxTempo); } } |
|
From: <sv...@op...> - 2024-09-08 11:44:16
|
Author: sagamusix Date: Sun Sep 8 13:44:02 2024 New Revision: 21572 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21572 Log: [Imp] MED: Tempo commands > 255 BPM were not imported properly if the files was imported as MOD instead of XM. Fixes OSS.Mad Frenchman (https://www.un4seen.com/forum/?topic=15448.msg143478#msg143478). Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Tue Sep 3 15:05:59 2024 (r21571) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Sun Sep 8 13:44:02 2024 (r21572) @@ -3382,18 +3382,16 @@ if(m_playBehaviour[kMODVBlankTiming]) { // ProTracker MODs with VBlank timing: All Fxx parameters set the tick count. - if(m_PlayState.m_flags[SONG_FIRSTTICK] && param != 0) SetSpeed(m_PlayState, param); - break; - } + if(m_PlayState.m_flags[SONG_FIRSTTICK] && param != 0) + SetSpeed(m_PlayState, param); + } else { param = CalculateXParam(m_PlayState.m_nPattern, m_PlayState.m_nRow, nChn); - if (GetType() & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT)) + if (GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT)) { if (param) chn.nOldTempo = static_cast<ModCommand::PARAM>(param); else param = chn.nOldTempo; } - TEMPO t(param, 0); - LimitMax(t, GetModSpecifications().GetTempoMax()); - SetTempo(t); + SetTempo(TEMPO(param, 0)); } break; @@ -6360,17 +6358,24 @@ // Anything lower than the minimum tempo is considered to be a tempo slide const TEMPO minTempo = GetMinimumTempoParam(GetType()); + TEMPO maxTempo = specs.GetTempoMax(); + // MED files may be imported with #xx parameter extension for tempos above 255, but they may be imported as either MOD or XM. + // As regular MOD files cannot contain effect #xx, the tempo parameter cannot exceed 255 anyway, so we simply ignore their max tempo in CModSpecifications here. + if(!(GetType() & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT))) + maxTempo = GetModSpecifications(MOD_TYPE_MPT).GetTempoMax(); + if(m_playBehaviour[kTempoClamp]) + maxTempo.Set(255); if(setFromUI) { // Set tempo from UI - ignore slide commands and such. - m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), specs.GetTempoMax()); + m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), maxTempo); } else if(param >= minTempo && m_PlayState.m_flags[SONG_FIRSTTICK] == !m_playBehaviour[kMODTempoOnSecondTick]) { // ProTracker sets the tempo after the first tick. // Note: The case of one tick per row is handled in ProcessRow() instead. // Test case: TempoChange.mod - m_PlayState.m_nMusicTempo = std::min(param, specs.GetTempoMax()); + m_PlayState.m_nMusicTempo = std::min(param, maxTempo); } else if(param < minTempo && !m_PlayState.m_flags[SONG_FIRSTTICK]) { // Tempo Slide @@ -6380,12 +6385,8 @@ else m_PlayState.m_nMusicTempo -= tempDiff; - TEMPO tempoMin = specs.GetTempoMin(), tempoMax = specs.GetTempoMax(); - if(m_playBehaviour[kTempoClamp]) // clamp tempo correctly in compatible mode - { - tempoMax.Set(255); - } - Limit(m_PlayState.m_nMusicTempo, tempoMin, tempoMax); + TEMPO tempoMin = specs.GetTempoMin(); + Limit(m_PlayState.m_nMusicTempo, tempoMin, maxTempo); } } |
|
From: <sv...@op...> - 2024-09-03 13:06:09
|
Author: manx Date: Tue Sep 3 15:05:59 2024 New Revision: 21571 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21571 Log: Merged revision(s) 21570 from trunk/OpenMPT: [Fix] Try a different work-around for cppcheck 2.15.0. See r21562. ........ Added: branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg - copied unchanged from r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Tue Sep 3 08:54:22 2024 (r21570) +++ branches/OpenMPT-1.31/Makefile Tue Sep 3 15:05:59 2024 (r21571) @@ -976,6 +976,7 @@ CPPCHECK_FLAGS += -j $(NUMTHREADS) CPPCHECK_FLAGS += --std=c11 --std=c++17 +CPPCHECK_FLAGS += --library=build/cppcheck/glibc-workarounds.cfg CPPCHECK_FLAGS += --quiet CPPCHECK_FLAGS += --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' CPPCHECK_FLAGS += --check-level=exhaustive Copied: branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg (from r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg Tue Sep 3 15:05:59 2024 (r21571, copy of r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<def format="2"> + <define name="__BEGIN_DECLS" value="extern "C" {"/> + <define name="__END_DECLS" value="}"/> +</def> Modified: branches/OpenMPT-1.31/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Tue Sep 3 08:54:22 2024 (r21570) +++ branches/OpenMPT-1.31/openmpt123/openmpt123.cpp Tue Sep 3 15:05:59 2024 (r21571) @@ -69,9 +69,7 @@ #include <cstring> #include <ctime> -#if defined(CPPCHECK) -// cppcheck 2.15.0 gets confused by linux/glibc headers -#elif MPT_OS_DJGPP +#if MPT_OS_DJGPP #include <conio.h> #include <crt0.h> #include <dpmi.h> |
|
From: <sv...@op...> - 2024-09-03 06:54:35
|
Author: manx Date: Tue Sep 3 08:54:22 2024 New Revision: 21570 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21570 Log: [Fix] Try a different work-around for cppcheck 2.15.0. See r21562. Added: trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg Modified: trunk/OpenMPT/Makefile trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Sun Sep 1 15:17:16 2024 (r21569) +++ trunk/OpenMPT/Makefile Tue Sep 3 08:54:22 2024 (r21570) @@ -1064,6 +1064,7 @@ #CPPCHECK_FLAGS += --std=c++20 CPPCHECK_FLAGS += --std=c++17 endif +CPPCHECK_FLAGS += --library=build/cppcheck/glibc-workarounds.cfg CPPCHECK_FLAGS += --quiet CPPCHECK_FLAGS += --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' CPPCHECK_FLAGS += --check-level=exhaustive Added: trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg Tue Sep 3 08:54:22 2024 (r21570) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<def format="2"> + <define name="__BEGIN_DECLS" value="extern "C" {"/> + <define name="__END_DECLS" value="}"/> +</def> Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 1 15:17:16 2024 (r21569) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Tue Sep 3 08:54:22 2024 (r21570) @@ -77,9 +77,7 @@ #include <cstdlib> #include <cstring> -#if defined(CPPCHECK) -// cppcheck 2.15.0 gets confused by linux/glibc headers -#elif MPT_OS_DJGPP +#if MPT_OS_DJGPP #include <conio.h> #include <crt0.h> #include <dpmi.h> |
|
From: <sv...@op...> - 2024-09-01 13:17:24
|
Author: manx Date: Sun Sep 1 15:17:16 2024 New Revision: 21569 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21569 Log: [Ref] openmpt123: Small cleanup. Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 1 11:44:21 2024 (r21568) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 1 15:17:16 2024 (r21569) @@ -37,7 +37,11 @@ #include "openmpt123_config.hpp" -#if defined(__MINGW32__) && !defined(__MINGW64__) +#include "mpt/base/detect_compiler.hpp" +#include "mpt/base/detect_os.hpp" +#include "mpt/base/detect_quirks.hpp" + +#if defined(MPT_LIBC_QUIRK_REQUIRES_SYS_TYPES_H) #include <sys/types.h> #endif @@ -90,7 +94,7 @@ #include <fcntl.h> #include <io.h> #include <stdio.h> -#if defined(__MINGW32__) && !defined(__MINGW64__) +#if MPT_LIBC_MINGW #include <string.h> #endif #include <sys/stat.h> |
|
From: <sv...@op...> - 2024-09-01 09:44:33
|
Author: manx Date: Sun Sep 1 11:44:21 2024 New Revision: 21568 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21568 Log: Merged revision(s) 21567 from trunk/OpenMPT: [Doc] libopenmpt: Fix building allegro4.2 instructions for DJGPP. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/doc/libopenmpt/gettingstarted.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/gettingstarted.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/gettingstarted.md Sun Sep 1 11:43:39 2024 (r21567) +++ branches/OpenMPT-1.31/doc/libopenmpt/gettingstarted.md Sun Sep 1 11:44:21 2024 (r21568) @@ -155,15 +155,10 @@ make CONFIG=djgpp `openmpt123` can use liballegro 4.2 for sound output on DJGPP/DOS. - liballegro can either be installed system-wide in the DJGPP environment - or downloaded into the `libopenmpt` source tree. - - make CONFIG=djgpp USE_ALLEGRO42=1 # use installed liballegro - - or + liballegro needs to be downloaded into the `libopenmpt` source tree. ./build/download_externals.sh # download liballegro source - make CONFIG=djgpp USE_ALLEGRO42=1 BUNDLED_ALLEGRO42=1 + make CONFIG=djgpp USE_ALLEGRO42=1 - American Fuzzy Lop: |
|
From: <sv...@op...> - 2024-09-01 09:43:52
|
Author: manx Date: Sun Sep 1 11:43:39 2024 New Revision: 21567 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21567 Log: [Doc] libopenmpt: Fix building allegro4.2 instructions for DJGPP. Modified: trunk/OpenMPT/doc/libopenmpt/gettingstarted.md Modified: trunk/OpenMPT/doc/libopenmpt/gettingstarted.md ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/gettingstarted.md Sun Sep 1 10:33:54 2024 (r21566) +++ trunk/OpenMPT/doc/libopenmpt/gettingstarted.md Sun Sep 1 11:43:39 2024 (r21567) @@ -155,15 +155,10 @@ make CONFIG=djgpp `openmpt123` can use liballegro 4.2 for sound output on DJGPP/DOS. - liballegro can either be installed system-wide in the DJGPP environment - or downloaded into the `libopenmpt` source tree. - - make CONFIG=djgpp USE_ALLEGRO42=1 # use installed liballegro - - or + liballegro needs to be downloaded into the `libopenmpt` source tree. ./build/download_externals.sh # download liballegro source - make CONFIG=djgpp USE_ALLEGRO42=1 BUNDLED_ALLEGRO42=1 + make CONFIG=djgpp USE_ALLEGRO42=1 - afl++: |
|
From: <sv...@op...> - 2024-09-01 08:34:05
|
Author: manx Date: Sun Sep 1 10:33:54 2024 New Revision: 21566 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21566 Log: Merged revision(s) 21564 from branches/OpenMPT-1.30: Merged revision(s) 21562 from trunk/OpenMPT: [Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]". ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.28/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Sun Sep 1 10:33:32 2024 (r21565) +++ branches/OpenMPT-1.28/openmpt123/openmpt123.cpp Sun Sep 1 10:33:54 2024 (r21566) @@ -58,7 +58,9 @@ #include <cstring> #include <ctime> -#if defined(__DJGPP__) +#if defined(CPPCHECK) +// cppcheck 2.15.0 gets confused by linux/glibc headers +#elif defined(__DJGPP__) #include <conio.h> #include <fcntl.h> #include <io.h> |
|
From: <sv...@op...> - 2024-09-01 08:33:44
|
Author: manx Date: Sun Sep 1 10:33:32 2024 New Revision: 21565 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21565 Log: Merged revision(s) 21564 from branches/OpenMPT-1.30: Merged revision(s) 21562 from trunk/OpenMPT: [Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]". ........ ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/openmpt123/openmpt123.cpp Modified: branches/OpenMPT-1.29/openmpt123/openmpt123.cpp ============================================================================== --- branches/OpenMPT-1.29/openmpt123/openmpt123.cpp Sun Sep 1 10:33:07 2024 (r21564) +++ branches/OpenMPT-1.29/openmpt123/openmpt123.cpp Sun Sep 1 10:33:32 2024 (r21565) @@ -62,7 +62,9 @@ #include <cstring> #include <ctime> -#if defined(__DJGPP__) +#if defined(CPPCHECK) +// cppcheck 2.15.0 gets confused by linux/glibc headers +#elif defined(__DJGPP__) #include <conio.h> #include <dpmi.h> #include <fcntl.h> |
3 messages has been excluded from this view by a project administrator.
