Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21270 - in trunk/OpenMPT: build/autotools contrib/fuzzing contrib/libmodplug-0.8.8.5 contrib/libmodplug-0.8.8.5/m4 contrib/libmodplug-0.8.9.0 contrib/libmodplug-0.8.9.0/m4 doc include/pugixml soundlib src/mpt/io src/mpt/io_read src/mpt/io_write src/openmpt/all src/openmpt/base src/openmpt/logging src/openmpt/random src/openmpt/soundbase src/openmpt/sounddevice
Author: manx Date: Wed Jul 24 11:11:45 2024 New Revision: 21270 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21270 Log: [Var] Fix svn:mime-type for various files. Modified: trunk/OpenMPT/build/autotools/ax_cxx_compile_stdcxx.m4 (props changed) trunk/OpenMPT/contrib/fuzzing/fuzz-secondary3.sh (props changed) trunk/OpenMPT/contrib/fuzzing/fuzz.cpp (props changed) trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am (props changed) trunk/OpenMPT/contrib/libmodplug-0.8.8.5/m4/ax_cxx_compile_stdcxx.m4 (props changed) trunk/OpenMPT/contrib/libmodplug-0.8.9.0/Makefile.am (props changed) trunk/OpenMPT/contrib/libmodplug-0.8.9.0/m4/ax_cxx_compile_stdcxx.m4 (props changed) trunk/OpenMPT/doc/string_types.md (props changed) trunk/OpenMPT/include/pugixml/LICENSE.md (props changed) trunk/OpenMPT/soundlib/Load_etx.cpp (contents, props changed) trunk/OpenMPT/soundlib/MODTools.h (props changed) trunk/OpenMPT/src/mpt/io/base.hpp (props changed) trunk/OpenMPT/src/mpt/io/io.hpp (props changed) trunk/OpenMPT/src/mpt/io/io_span.hpp (props changed) trunk/OpenMPT/src/mpt/io/io_stdstream.hpp (props changed) trunk/OpenMPT/src/mpt/io/io_virtual_wrapper.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/callbackstream.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_callbackstream.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_filename_traits.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_memory.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_stdstream.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_traits_filedata.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filecursor_traits_memory.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_base.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_base_buffered.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_base_seekable.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_base_unseekable.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_callbackstream.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_memory.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filedata_stdstream.hpp (props changed) trunk/OpenMPT/src/mpt/io_read/filereader.hpp (props changed) trunk/OpenMPT/src/mpt/io_write/buffer.hpp (props changed) trunk/OpenMPT/src/openmpt/all/BuildSettings.hpp (props changed) trunk/OpenMPT/src/openmpt/base/Endian.hpp (props changed) trunk/OpenMPT/src/openmpt/base/FlagSet.hpp (props changed) trunk/OpenMPT/src/openmpt/base/Types.hpp (props changed) trunk/OpenMPT/src/openmpt/logging/Logger.hpp (props changed) trunk/OpenMPT/src/openmpt/random/ModPlug.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/Copy.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/CopyMix.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/Dither.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/DitherModPlug.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/DitherNone.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/DitherSimple.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/MixSample.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/MixSampleConvert.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleClip.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleClipFixedPoint.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleConvertFixedPoint.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleDecode.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleEncode.hpp (props changed) trunk/OpenMPT/src/openmpt/soundbase/SampleFormat.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDevice.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceASIO.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceBase.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceBuffer.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceCallback.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceDirectSound.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceManager.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePortAudio.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseSimple.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePulseaudio.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceRtAudio.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceUtilities.hpp (props changed) trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceWaveout.hpp (props changed) Modified: trunk/OpenMPT/soundlib/Load_etx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_etx.cpp Wed Jul 24 11:11:22 2024 (r21269) +++ trunk/OpenMPT/soundlib/Load_etx.cpp Wed Jul 24 11:11:45 2024 (r21270) @@ -1,177 +1,177 @@ -/* - * Load_etx.cpp - * ------------ - * Purpose: EasyTrax (ETX) module loader - * Notes : (currently none) - * Authors: OpenMPT Devs - * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. - */ - - -#include "stdafx.h" -#include "Loaders.h" - -OPENMPT_NAMESPACE_BEGIN - -struct ETXFileHeader -{ - char magic[14]; // 'EASYTRAX 1.0\x01\x00' - uint8 tempo; - uint8 lastPattern; - uint32le orderlistOffset; - uint32le patternsOffset; - uint32le sampleHeadersOffset; - uint32le sampleDataOffset; - - bool IsValid() const - { - return !memcmp(magic, "EASYTRAX 1.0\x01\x00", 14) - && tempo > 0 - && lastPattern <= 127 - && orderlistOffset >= 32 && orderlistOffset < 0x80'0000 - && patternsOffset >= 32 && patternsOffset < 0x80'0000 - && sampleHeadersOffset >= 32 && sampleHeadersOffset < 0x80'0000 - && sampleDataOffset >= 32 && sampleDataOffset < 0x80'0000; - } - - uint32 GetHeaderMinimumAdditionalSize() const - { - return 1024; // Order list - } -}; - -MPT_BINARY_STRUCT(ETXFileHeader, 32) - - -struct ETXSampleHeader -{ - char name[13]; - uint32le offset; // Relative to fileHeader.sampleDataOffset - uint32le length; - uint32le loopStart; // 0xFFFFFFFF if no loop - uint32le sampleRate; - int8 transpose; - int8 finetune; - uint8 zero; - - void ConvertToMPT(ModSample &mptSmp) const - { - mptSmp.Initialize(); - mptSmp.nC5Speed = sampleRate; - mptSmp.nLength = length; - if(loopStart != uint32_max) - { - mptSmp.nLoopStart = loopStart; - mptSmp.nLoopEnd = mptSmp.nLength; - mptSmp.uFlags.set(CHN_LOOP); - } - mptSmp.Transpose((transpose * 100 + finetune) / 1200.0); - } -}; - -MPT_BINARY_STRUCT(ETXSampleHeader, 32) - - -CSoundFile::ProbeResult CSoundFile::ProbeFileHeaderETX(MemoryFileReader file, const uint64 *pfilesize) -{ - ETXFileHeader fileHeader; - if(!file.ReadStruct(fileHeader)) - return ProbeWantMoreData; - if(!fileHeader.IsValid()) - return ProbeFailure; - return ProbeAdditionalSize(file, pfilesize, fileHeader.GetHeaderMinimumAdditionalSize()); -} - - -bool CSoundFile::ReadETX(FileReader &file, ModLoadingFlags loadFlags) -{ - ETXFileHeader fileHeader; - file.Rewind(); - if(!file.ReadStruct(fileHeader) || !fileHeader.IsValid()) - return false; - if(!file.CanRead(fileHeader.GetHeaderMinimumAdditionalSize())) - return false; - if(loadFlags == onlyVerifyHeader) - return true; - - InitializeGlobals(MOD_TYPE_S3M, 4); - m_SongFlags.set(SONG_IMPORTED); - m_playBehaviour.reset(kST3EffectMemory); - m_nMinPeriod = 218; // Highest possible sample playback rate appears to be 65535 Hz - m_nSamples = 128; - Order().SetDefaultTempoInt(fileHeader.tempo); - Order().SetDefaultSpeed(6); - - if(!file.Seek(fileHeader.orderlistOffset)) - return false; - ReadOrderFromFile<uint8>(Order(), file, 1024, 0xFF); - for(ORDERINDEX ord = 0; ord < Order().size(); ord++) - { - if(Order()[ord] == Order().GetInvalidPatIndex()) - Order().resize(ord); - else if(Order()[ord] > 127) - return false; - } - - if(!file.Seek(fileHeader.patternsOffset)) - return false; - Patterns.ResizeArray(fileHeader.lastPattern + 1); - for(PATTERNINDEX pat = 0; pat < Patterns.Size(); pat++) - { - if(!(loadFlags & loadPatternData) || !file.CanRead(1024) || !Patterns.Insert(pat, 64)) - break; - - auto m = Patterns[pat].begin(); - for(ROWINDEX row = 0; row < Patterns[pat].GetNumRows(); row++) - { - for(CHANNELINDEX chn = 0; chn < 4; chn++, m++) - { - const auto [note, vol, instr, unused] = file.ReadArray<uint8, 4>(); - MPT_UNUSED_VARIABLE(unused); - if(note == 0xFF && !chn) - { - if(!Patterns[pat].WriteEffect(EffectWriter(CMD_PATTERNBREAK, 0).Row(std::max(row, ROWINDEX(1)) - 1))) - { - Patterns[pat].Resize(row, false); - break; - } - } else if(note == 0xFE) - { - m->SetEffectCommand(CMD_VOLUMEDOWN_ETX, vol); - } else if(note > 0 && note <= 96) - { - m->note = NOTE_MIDDLEC - 24 + note; - m->instr = instr + 1; - m->SetVolumeCommand(VOLCMD_VOLUME, static_cast<ModCommand::VOL>((std::min(vol, uint8(127)) + 1u) / 2u)); - } - } - } - } - - if(!file.Seek(fileHeader.sampleHeadersOffset)) - return false; - FileReader sampleHeaderChunk = file.ReadChunk(128 * sizeof(ETXSampleHeader)); - for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) - { - ETXSampleHeader sampleHeader; - sampleHeaderChunk.ReadStruct(sampleHeader); - sampleHeader.ConvertToMPT(Samples[smp]); - m_szNames[smp] = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, sampleHeader.name); - if(loadFlags & loadSampleData) - { - if(!file.Seek(fileHeader.sampleDataOffset + sampleHeader.offset)) - return false; - SampleIO(SampleIO::_8bit, SampleIO::mono, SampleIO::littleEndian, SampleIO::unsignedPCM) - .ReadSample(Samples[smp], file); - } - } - - m_modFormat.formatName = UL_("EasyTrax"); - m_modFormat.type = UL_("etx"); - m_modFormat.charset = mpt::Charset::CP437; - - return true; -} - - -OPENMPT_NAMESPACE_END +/* + * Load_etx.cpp + * ------------ + * Purpose: EasyTrax (ETX) module loader + * Notes : (currently none) + * Authors: OpenMPT Devs + * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. + */ + + +#include "stdafx.h" +#include "Loaders.h" + +OPENMPT_NAMESPACE_BEGIN + +struct ETXFileHeader +{ + char magic[14]; // 'EASYTRAX 1.0\x01\x00' + uint8 tempo; + uint8 lastPattern; + uint32le orderlistOffset; + uint32le patternsOffset; + uint32le sampleHeadersOffset; + uint32le sampleDataOffset; + + bool IsValid() const + { + return !memcmp(magic, "EASYTRAX 1.0\x01\x00", 14) + && tempo > 0 + && lastPattern <= 127 + && orderlistOffset >= 32 && orderlistOffset < 0x80'0000 + && patternsOffset >= 32 && patternsOffset < 0x80'0000 + && sampleHeadersOffset >= 32 && sampleHeadersOffset < 0x80'0000 + && sampleDataOffset >= 32 && sampleDataOffset < 0x80'0000; + } + + uint32 GetHeaderMinimumAdditionalSize() const + { + return 1024; // Order list + } +}; + +MPT_BINARY_STRUCT(ETXFileHeader, 32) + + +struct ETXSampleHeader +{ + char name[13]; + uint32le offset; // Relative to fileHeader.sampleDataOffset + uint32le length; + uint32le loopStart; // 0xFFFFFFFF if no loop + uint32le sampleRate; + int8 transpose; + int8 finetune; + uint8 zero; + + void ConvertToMPT(ModSample &mptSmp) const + { + mptSmp.Initialize(); + mptSmp.nC5Speed = sampleRate; + mptSmp.nLength = length; + if(loopStart != uint32_max) + { + mptSmp.nLoopStart = loopStart; + mptSmp.nLoopEnd = mptSmp.nLength; + mptSmp.uFlags.set(CHN_LOOP); + } + mptSmp.Transpose((transpose * 100 + finetune) / 1200.0); + } +}; + +MPT_BINARY_STRUCT(ETXSampleHeader, 32) + + +CSoundFile::ProbeResult CSoundFile::ProbeFileHeaderETX(MemoryFileReader file, const uint64 *pfilesize) +{ + ETXFileHeader fileHeader; + if(!file.ReadStruct(fileHeader)) + return ProbeWantMoreData; + if(!fileHeader.IsValid()) + return ProbeFailure; + return ProbeAdditionalSize(file, pfilesize, fileHeader.GetHeaderMinimumAdditionalSize()); +} + + +bool CSoundFile::ReadETX(FileReader &file, ModLoadingFlags loadFlags) +{ + ETXFileHeader fileHeader; + file.Rewind(); + if(!file.ReadStruct(fileHeader) || !fileHeader.IsValid()) + return false; + if(!file.CanRead(fileHeader.GetHeaderMinimumAdditionalSize())) + return false; + if(loadFlags == onlyVerifyHeader) + return true; + + InitializeGlobals(MOD_TYPE_S3M, 4); + m_SongFlags.set(SONG_IMPORTED); + m_playBehaviour.reset(kST3EffectMemory); + m_nMinPeriod = 218; // Highest possible sample playback rate appears to be 65535 Hz + m_nSamples = 128; + Order().SetDefaultTempoInt(fileHeader.tempo); + Order().SetDefaultSpeed(6); + + if(!file.Seek(fileHeader.orderlistOffset)) + return false; + ReadOrderFromFile<uint8>(Order(), file, 1024, 0xFF); + for(ORDERINDEX ord = 0; ord < Order().size(); ord++) + { + if(Order()[ord] == Order().GetInvalidPatIndex()) + Order().resize(ord); + else if(Order()[ord] > 127) + return false; + } + + if(!file.Seek(fileHeader.patternsOffset)) + return false; + Patterns.ResizeArray(fileHeader.lastPattern + 1); + for(PATTERNINDEX pat = 0; pat < Patterns.Size(); pat++) + { + if(!(loadFlags & loadPatternData) || !file.CanRead(1024) || !Patterns.Insert(pat, 64)) + break; + + auto m = Patterns[pat].begin(); + for(ROWINDEX row = 0; row < Patterns[pat].GetNumRows(); row++) + { + for(CHANNELINDEX chn = 0; chn < 4; chn++, m++) + { + const auto [note, vol, instr, unused] = file.ReadArray<uint8, 4>(); + MPT_UNUSED_VARIABLE(unused); + if(note == 0xFF && !chn) + { + if(!Patterns[pat].WriteEffect(EffectWriter(CMD_PATTERNBREAK, 0).Row(std::max(row, ROWINDEX(1)) - 1))) + { + Patterns[pat].Resize(row, false); + break; + } + } else if(note == 0xFE) + { + m->SetEffectCommand(CMD_VOLUMEDOWN_ETX, vol); + } else if(note > 0 && note <= 96) + { + m->note = NOTE_MIDDLEC - 24 + note; + m->instr = instr + 1; + m->SetVolumeCommand(VOLCMD_VOLUME, static_cast<ModCommand::VOL>((std::min(vol, uint8(127)) + 1u) / 2u)); + } + } + } + } + + if(!file.Seek(fileHeader.sampleHeadersOffset)) + return false; + FileReader sampleHeaderChunk = file.ReadChunk(128 * sizeof(ETXSampleHeader)); + for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) + { + ETXSampleHeader sampleHeader; + sampleHeaderChunk.ReadStruct(sampleHeader); + sampleHeader.ConvertToMPT(Samples[smp]); + m_szNames[smp] = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, sampleHeader.name); + if(loadFlags & loadSampleData) + { + if(!file.Seek(fileHeader.sampleDataOffset + sampleHeader.offset)) + return false; + SampleIO(SampleIO::_8bit, SampleIO::mono, SampleIO::littleEndian, SampleIO::unsignedPCM) + .ReadSample(Samples[smp], file); + } + } + + m_modFormat.formatName = UL_("EasyTrax"); + m_modFormat.type = UL_("etx"); + m_modFormat.charset = mpt::Charset::CP437; + + return true; +} + + +OPENMPT_NAMESPACE_END |
