modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r20409 - in branches/OpenMPT-1.29: . soundlib soundlib/plugins/dmo

[<sv...@op...>]

Author: sagamusix
Date: Sun Mar 17 13:36:19 2024
New Revision: 20409
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20409

Log:
Merged revision(s) 20385-20406 from trunk/OpenMPT:
[Mod] Compressor DMO: Similar to Chorus / Flanger, avoid chance of reading from the wrong buffer offset at extremely high sample rates. In this particular case, the mix rate needs to be above 500 kHz before the overflow would occur.
........
[Fix] MED: Some samples were playing too low (e.g. in mix94.mmd1, see https://www.un4seen.com/forum/?topic=15448.msg142556#msg142556)
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/soundlib/Load_med.cpp
   branches/OpenMPT-1.29/soundlib/plugins/dmo/Compressor.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_med.cpp	Sun Mar 17 13:35:23 2024	(r20408)
+++ branches/OpenMPT-1.29/soundlib/Load_med.cpp	Sun Mar 17 13:36:19 2024	(r20409)
@@ -799,6 +799,9 @@
 			instr.AssignSample(0);
 		}
 
+		MMD0Sample sampleHeader;
+		sampleHeaderChunk.ReadStruct(sampleHeader);
+
 		uint8 numSamples = 1;
 		static constexpr uint8 SamplesPerType[] = {1, 5, 3, 2, 4, 6, 7};
 		if(!isSynth && maskedType < std::size(SamplesPerType))
@@ -831,10 +834,10 @@
 			// TODO: Move octaves so that they align better (C-4 = lowest, we don't have access to the highest four octaves)
 			for(int octave = 4; octave < 10; octave++)
 			{
-				for(int note = 0; note < 12; note++)
+				for(int note = 0, i = 12 * octave; note < 12; note++, i++)
 				{
-					instr.Keyboard[12 * octave + note] = smp + OctSampleMap[numSamples - 2][octave - 4];
-					instr.NoteMap[12 * octave + note] += OctTransposeMap[numSamples - 2][octave - 4];
+					instr.Keyboard[i] = smp + OctSampleMap[numSamples - 2][octave - 4];
+					instr.NoteMap[i] = static_cast<uint8>(instr.NoteMap[i] + OctTransposeMap[numSamples - 2][octave - 4]);
 				}
 			}
 		} else if(maskedType == MMDInstrHeader::EXTSAMPLE)
@@ -843,18 +846,14 @@
 			instr.Transpose(-24);
 		} else if(!isSynth && hardwareMixSamples)
 		{
-			for(int octave = 7; octave < 10; octave++)
+			for(auto &note : instr.NoteMap)
 			{
-				for(int note = 0; note < 12; note++)
-				{
-					instr.NoteMap[12 * octave + note] -= static_cast<uint8>((octave - 6) * 12);
-				}
+				int realNote = note + sampleHeader.sampleTranspose;
+				if(realNote >= NOTE_MIDDLEC + 24)
+					note -= static_cast<uint8>(mpt::align_down(realNote - NOTE_MIDDLEC - 12, 12));
 			}
 		}
 
-		MMD0Sample sampleHeader;
-		sampleHeaderChunk.ReadStruct(sampleHeader);
-
 		// midiChannel = 0xFF == midi instrument but with invalid channel, midiChannel = 0x00 == sample-based instrument?
 		if(sampleHeader.midiChannel > 0 && sampleHeader.midiChannel <= 16)
 		{
@@ -1132,12 +1131,12 @@
 				if(!order.empty())
 					order.push_back(order.GetIgnoreIndex());
 
+				const size_t orderStart = order.size();
 				size_t readOrders = playSeq.length;
 				if(!file.CanRead(readOrders))
 					LimitMax(readOrders, file.BytesLeft());
 				LimitMax(readOrders, ORDERINDEX_MAX);
 
-				size_t orderStart = order.size();
 				order.reserve(orderStart + readOrders);
 				for(size_t ord = 0; ord < readOrders; ord++)
 				{

Modified: branches/OpenMPT-1.29/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:35:23 2024	(r20408)
+++ branches/OpenMPT-1.29/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:36:19 2024	(r20409)
@@ -89,10 +89,10 @@
 		}
 		compGainPow >>= (31 - compGainInt);
 		
-		int32 readOffset = m_predelay + m_bufPos * 4096 + m_bufSize - 1;
+		int32 readOffset = m_predelay + m_bufSize - 1;
 		readOffset /= 4096;
-		readOffset %= m_bufSize;
-		
+		readOffset = (readOffset + m_bufPos) % m_bufSize;
+
 		float outGain = (compGainPow * (1.0f / 2147483648.0f)) * m_gain;
 		*(out[0])++ = m_buffer[readOffset * 2] * outGain;
 		*(out[1])++ = m_buffer[readOffset * 2 + 1] * outGain;

[OMPT-svn-commit] OpenMPT r20408 - in branches/OpenMPT-1.30: . soundlib soundlib/plugins/dmo

[<sv...@op...>]

Author: sagamusix
Date: Sun Mar 17 13:35:23 2024
New Revision: 20408
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20408

Log:
Merged revision(s) 20385-20406 from trunk/OpenMPT:
[Mod] Compressor DMO: Similar to Chorus / Flanger, avoid chance of reading from the wrong buffer offset at extremely high sample rates. In this particular case, the mix rate needs to be above 500 kHz before the overflow would occur.
........
[Fix] MED: Some samples were playing too low (e.g. in mix94.mmd1, see https://www.un4seen.com/forum/?topic=15448.msg142556#msg142556)
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Load_med.cpp
   branches/OpenMPT-1.30/soundlib/plugins/dmo/Compressor.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Mar 17 13:34:44 2024	(r20407)
+++ branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Mar 17 13:35:23 2024	(r20408)
@@ -804,6 +804,9 @@
 			instr.AssignSample(0);
 		}
 
+		MMD0Sample sampleHeader;
+		sampleHeaderChunk.ReadStruct(sampleHeader);
+
 		uint8 numSamples = 1;
 		static constexpr uint8 SamplesPerType[] = {1, 5, 3, 2, 4, 6, 7};
 		if(!isSynth && maskedType < std::size(SamplesPerType))
@@ -836,10 +839,10 @@
 			// TODO: Move octaves so that they align better (C-4 = lowest, we don't have access to the highest four octaves)
 			for(int octave = 4; octave < 10; octave++)
 			{
-				for(int note = 0; note < 12; note++)
+				for(int note = 0, i = 12 * octave; note < 12; note++, i++)
 				{
-					instr.Keyboard[12 * octave + note] = smp + OctSampleMap[numSamples - 2][octave - 4];
-					instr.NoteMap[12 * octave + note] += OctTransposeMap[numSamples - 2][octave - 4];
+					instr.Keyboard[i] = smp + OctSampleMap[numSamples - 2][octave - 4];
+					instr.NoteMap[i] = static_cast<uint8>(instr.NoteMap[i] + OctTransposeMap[numSamples - 2][octave - 4]);
 				}
 			}
 		} else if(maskedType == MMDInstrHeader::EXTSAMPLE)
@@ -848,18 +851,14 @@
 			instr.Transpose(-24);
 		} else if(!isSynth && hardwareMixSamples)
 		{
-			for(int octave = 7; octave < 10; octave++)
+			for(auto &note : instr.NoteMap)
 			{
-				for(int note = 0; note < 12; note++)
-				{
-					instr.NoteMap[12 * octave + note] -= static_cast<uint8>((octave - 6) * 12);
-				}
+				int realNote = note + sampleHeader.sampleTranspose;
+				if(realNote >= NOTE_MIDDLEC + 24)
+					note -= static_cast<uint8>(mpt::align_down(realNote - NOTE_MIDDLEC - 12, 12));
 			}
 		}
 
-		MMD0Sample sampleHeader;
-		sampleHeaderChunk.ReadStruct(sampleHeader);
-
 		// midiChannel = 0xFF == midi instrument but with invalid channel, midiChannel = 0x00 == sample-based instrument?
 		if(sampleHeader.midiChannel > 0 && sampleHeader.midiChannel <= 16)
 		{
@@ -1137,12 +1136,12 @@
 				if(!order.empty())
 					order.push_back(order.GetIgnoreIndex());
 
+				const size_t orderStart = order.size();
 				size_t readOrders = playSeq.length;
 				if(!file.CanRead(readOrders))
 					LimitMax(readOrders, file.BytesLeft());
 				LimitMax(readOrders, ORDERINDEX_MAX);
 
-				size_t orderStart = order.size();
 				order.reserve(orderStart + readOrders);
 				for(size_t ord = 0; ord < readOrders; ord++)
 				{

Modified: branches/OpenMPT-1.30/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:34:44 2024	(r20407)
+++ branches/OpenMPT-1.30/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:35:23 2024	(r20408)
@@ -89,10 +89,10 @@
 		}
 		compGainPow >>= (31 - compGainInt);
 		
-		int32 readOffset = m_predelay + m_bufPos * 4096 + m_bufSize - 1;
+		int32 readOffset = m_predelay + m_bufSize - 1;
 		readOffset /= 4096;
-		readOffset %= m_bufSize;
-		
+		readOffset = (readOffset + m_bufPos) % m_bufSize;
+
 		float outGain = (compGainPow * (1.0f / 2147483648.0f)) * m_gain;
 		*(out[0])++ = m_buffer[readOffset * 2] * outGain;
 		*(out[1])++ = m_buffer[readOffset * 2 + 1] * outGain;

[OMPT-svn-commit] OpenMPT r20407 - in branches/OpenMPT-1.31: . soundlib soundlib/plugins/dmo

[<sv...@op...>]

Author: sagamusix
Date: Sun Mar 17 13:34:44 2024
New Revision: 20407
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20407

Log:
Merged revision(s) 20385-20406 from trunk/OpenMPT:
[Mod] Compressor DMO: Similar to Chorus / Flanger, avoid chance of reading from the wrong buffer offset at extremely high sample rates. In this particular case, the mix rate needs to be above 500 kHz before the overflow would occur.
........
[Fix] MED: Some samples were playing too low (e.g. in mix94.mmd1, see https://www.un4seen.com/forum/?topic=15448.msg142556#msg142556)
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_med.cpp
   branches/OpenMPT-1.31/soundlib/plugins/dmo/Compressor.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sun Mar 17 13:33:14 2024	(r20406)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sun Mar 17 13:34:44 2024	(r20407)
@@ -818,6 +818,9 @@
 			instr.AssignSample(0);
 		}
 
+		MMD0Sample sampleHeader;
+		sampleHeaderChunk.ReadStruct(sampleHeader);
+
 		uint8 numSamples = 1;
 		static constexpr uint8 SamplesPerType[] = {1, 5, 3, 2, 4, 6, 7};
 		if(!isSynth && maskedType < std::size(SamplesPerType))
@@ -850,10 +853,10 @@
 			// TODO: Move octaves so that they align better (C-4 = lowest, we don't have access to the highest four octaves)
 			for(int octave = 4; octave < 10; octave++)
 			{
-				for(int note = 0; note < 12; note++)
+				for(int note = 0, i = 12 * octave; note < 12; note++, i++)
 				{
-					instr.Keyboard[12 * octave + note] = smp + OctSampleMap[numSamples - 2][octave - 4];
-					instr.NoteMap[12 * octave + note] += OctTransposeMap[numSamples - 2][octave - 4];
+					instr.Keyboard[i] = smp + OctSampleMap[numSamples - 2][octave - 4];
+					instr.NoteMap[i] = static_cast<uint8>(instr.NoteMap[i] + OctTransposeMap[numSamples - 2][octave - 4]);
 				}
 			}
 		} else if(maskedType == MMDInstrHeader::EXTSAMPLE)
@@ -862,18 +865,14 @@
 			instr.Transpose(-24);
 		} else if(!isSynth && hardwareMixSamples)
 		{
-			for(int octave = 7; octave < 10; octave++)
+			for(auto &note : instr.NoteMap)
 			{
-				for(int note = 0; note < 12; note++)
-				{
-					instr.NoteMap[12 * octave + note] -= static_cast<uint8>((octave - 6) * 12);
-				}
+				int realNote = note + sampleHeader.sampleTranspose;
+				if(realNote >= NOTE_MIDDLEC + 24)
+					note -= static_cast<uint8>(mpt::align_down(realNote - NOTE_MIDDLEC - 12, 12));
 			}
 		}
 
-		MMD0Sample sampleHeader;
-		sampleHeaderChunk.ReadStruct(sampleHeader);
-
 		// midiChannel = 0xFF == midi instrument but with invalid channel, midiChannel = 0x00 == sample-based instrument?
 		if(sampleHeader.midiChannel > 0 && sampleHeader.midiChannel <= 16)
 		{
@@ -1153,12 +1152,12 @@
 				if(!order.empty())
 					order.push_back(order.GetIgnoreIndex());
 
+				const size_t orderStart = order.size();
 				size_t readOrders = playSeq.length;
 				if(!file.CanRead(readOrders))
 					LimitMax(readOrders, file.BytesLeft());
 				LimitMax(readOrders, ORDERINDEX_MAX);
 
-				size_t orderStart = order.size();
 				order.reserve(orderStart + readOrders);
 				for(size_t ord = 0; ord < readOrders; ord++)
 				{

Modified: branches/OpenMPT-1.31/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:33:14 2024	(r20406)
+++ branches/OpenMPT-1.31/soundlib/plugins/dmo/Compressor.cpp	Sun Mar 17 13:34:44 2024	(r20407)
@@ -88,10 +88,10 @@
 		}
 		compGainPow >>= (31 - compGainInt);
 		
-		int32 readOffset = m_predelay + m_bufPos * 4096 + m_bufSize - 1;
+		int32 readOffset = m_predelay + m_bufSize - 1;
 		readOffset /= 4096;
-		readOffset %= m_bufSize;
-		
+		readOffset = (readOffset + m_bufPos) % m_bufSize;
+
 		float outGain = (static_cast<float>(compGainPow) * (1.0f / 2147483648.0f)) * m_gain;
 		*(out[0])++ = m_buffer[readOffset * 2] * outGain;
 		*(out[1])++ = m_buffer[readOffset * 2 + 1] * outGain;

[OMPT-svn-commit] OpenMPT r20406 - trunk/OpenMPT/soundlib

[<sv...@op...>]

Author: sagamusix
Date: Sun Mar 17 13:33:14 2024
New Revision: 20406
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20406

Log:
[Fix] MED: Some samples were playing too low (e.g. in mix94.mmd1, see https://www.un4seen.com/forum/?topic=15448.msg142556#msg142556)

Modified:
   trunk/OpenMPT/soundlib/Load_med.cpp

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	Sun Mar 17 08:46:17 2024	(r20405)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	Sun Mar 17 13:33:14 2024	(r20406)
@@ -818,6 +818,9 @@
 			instr.AssignSample(0);
 		}
 
+		MMD0Sample sampleHeader;
+		sampleHeaderChunk.ReadStruct(sampleHeader);
+
 		uint8 numSamples = 1;
 		static constexpr uint8 SamplesPerType[] = {1, 5, 3, 2, 4, 6, 7};
 		if(!isSynth && maskedType < std::size(SamplesPerType))
@@ -850,17 +853,10 @@
 			// TODO: Move octaves so that they align better (C-4 = lowest, we don't have access to the highest four octaves)
 			for(int octave = 4; octave < 10; octave++)
 			{
-				for(int note = 0; note < 12; note++)
+				for(int note = 0, i = 12 * octave; note < 12; note++, i++)
 				{
-					instr.Keyboard[12 * octave + note] = smp + OctSampleMap[numSamples - 2][octave - 4];
-#if MPT_COMPILER_GCC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-					instr.NoteMap[12 * octave + note] += OctTransposeMap[numSamples - 2][octave - 4];
-#if MPT_COMPILER_GCC
-#pragma GCC diagnostic pop
-#endif
+					instr.Keyboard[i] = smp + OctSampleMap[numSamples - 2][octave - 4];
+					instr.NoteMap[i] = static_cast<uint8>(instr.NoteMap[i] + OctTransposeMap[numSamples - 2][octave - 4]);
 				}
 			}
 		} else if(maskedType == MMDInstrHeader::EXTSAMPLE)
@@ -869,18 +865,14 @@
 			instr.Transpose(-24);
 		} else if(!isSynth && hardwareMixSamples)
 		{
-			for(int octave = 7; octave < 10; octave++)
+			for(auto &note : instr.NoteMap)
 			{
-				for(int note = 0; note < 12; note++)
-				{
-					instr.NoteMap[12 * octave + note] -= static_cast<uint8>((octave - 6) * 12);
-				}
+				int realNote = note + sampleHeader.sampleTranspose;
+				if(realNote >= NOTE_MIDDLEC + 24)
+					note -= static_cast<uint8>(mpt::align_down(realNote - NOTE_MIDDLEC - 12, 12));
 			}
 		}
 
-		MMD0Sample sampleHeader;
-		sampleHeaderChunk.ReadStruct(sampleHeader);
-
 		// midiChannel = 0xFF == midi instrument but with invalid channel, midiChannel = 0x00 == sample-based instrument?
 		if(sampleHeader.midiChannel > 0 && sampleHeader.midiChannel <= 16)
 		{
@@ -1160,12 +1152,12 @@
 				if(!order.empty())
 					order.push_back(order.GetIgnoreIndex());
 
+				const size_t orderStart = order.size();
 				size_t readOrders = playSeq.length;
 				if(!file.CanRead(readOrders))
 					LimitMax(readOrders, file.BytesLeft());
 				LimitMax(readOrders, ORDERINDEX_MAX);
 
-				size_t orderStart = order.size();
 				order.reserve(orderStart + readOrders);
 				for(size_t ord = 0; ord < readOrders; ord++)
 				{

[OMPT-svn-commit] OpenMPT r20405 - branches/OpenMPT-1.31/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:46:17 2024
New Revision: 20405
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20405

Log:
[Mod] OpenMPT: Version is now 1.31.05.03

Modified:
   branches/OpenMPT-1.31/common/versionNumber.h

Modified: branches/OpenMPT-1.31/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.31/common/versionNumber.h	Sun Mar 17 08:45:43 2024	(r20404)
+++ branches/OpenMPT-1.31/common/versionNumber.h	Sun Mar 17 08:46:17 2024	(r20405)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
 #define VER_MINOR      05
-#define VER_MINORMINOR 02
+#define VER_MINORMINOR 03
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20403 - in branches/OpenMPT-1.28/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:42 2024
New Revision: 20403
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20403

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:41 2024	(r20402)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:42 2024	(r20403)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.4.41-pre
+
 ### libopenmpt 0.4.40 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:41 2024	(r20402)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:42 2024	(r20403)
@@ -19,11 +19,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 4
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 40
+#define OPENMPT_API_VERSION_PATCH 41
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:41 2024	(r20402)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:42 2024	(r20403)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=4
-LIBOPENMPT_VERSION_PATCH=40
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=41
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=1
-LIBOPENMPT_LTVER_REVISION=40
+LIBOPENMPT_LTVER_REVISION=41
 LIBOPENMPT_LTVER_AGE=1

[OMPT-svn-commit] OpenMPT r20404 - branches/OpenMPT-1.28/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:43 2024
New Revision: 20404
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20404

Log:
[Mod] OpenMPT: Version is now 1.28.10.59

Modified:
   branches/OpenMPT-1.28/common/versionNumber.h

Modified: branches/OpenMPT-1.28/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar 17 08:45:42 2024	(r20403)
+++ branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar 17 08:45:43 2024	(r20404)
@@ -21,7 +21,7 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      28
 #define VER_MINOR      10
-#define VER_MINORMINOR 58
+#define VER_MINORMINOR 59
 
 //Numerical value of the version.
 #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR)

[OMPT-svn-commit] OpenMPT r20401 - in branches/OpenMPT-1.28/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:40 2024
New Revision: 20401
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20401

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:40 2024	(r20400)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:40 2024	(r20401)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.4.40-pre
+### libopenmpt 0.4.40 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory
     allocation (64bit platforms) when reading close to 4GiB of data from

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:40 2024	(r20400)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:40 2024	(r20401)
@@ -21,9 +21,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 40
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:40 2024	(r20400)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:40 2024	(r20401)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=4
 LIBOPENMPT_VERSION_PATCH=40
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=1
 LIBOPENMPT_LTVER_REVISION=40

[OMPT-svn-commit] OpenMPT r20400 - branches/OpenMPT-1.28/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:40 2024
New Revision: 20400
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20400

Log:
[Mod] OpenMPT: Version is now 1.28.10.58

Modified:
   branches/OpenMPT-1.28/common/versionNumber.h

Modified: branches/OpenMPT-1.28/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar 17 08:45:20 2024	(r20399)
+++ branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar 17 08:45:40 2024	(r20400)
@@ -21,7 +21,7 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      28
 #define VER_MINOR      10
-#define VER_MINORMINOR 57
+#define VER_MINORMINOR 58
 
 //Numerical value of the version.
 #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR)

[OMPT-svn-commit] OpenMPT r20402 - tags/libopenmpt-0.4.40

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:41 2024
New Revision: 20402
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20402

Log:
tag libopenmpt-0.4.40

Added:
   tags/libopenmpt-0.4.40/   (props changed)
      - copied from r20401, branches/OpenMPT-1.28/

[OMPT-svn-commit] OpenMPT r20399 - branches/OpenMPT-1.29/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:20 2024
New Revision: 20399
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20399

Log:
[Mod] OpenMPT: Version is now 1.29.15.29

Modified:
   branches/OpenMPT-1.29/common/versionNumber.h

Modified: branches/OpenMPT-1.29/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.29/common/versionNumber.h	Sun Mar 17 08:45:20 2024	(r20398)
+++ branches/OpenMPT-1.29/common/versionNumber.h	Sun Mar 17 08:45:20 2024	(r20399)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      29
 #define VER_MINOR      15
-#define VER_MINORMINOR 28
+#define VER_MINORMINOR 29
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20397 - tags/libopenmpt-0.5.28

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:19 2024
New Revision: 20397
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20397

Log:
tag libopenmpt-0.5.28

Added:
   tags/libopenmpt-0.5.28/   (props changed)
      - copied from r20396, branches/OpenMPT-1.29/

[OMPT-svn-commit] OpenMPT r20396 - in branches/OpenMPT-1.29/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:18 2024
New Revision: 20396
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20396

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:18 2024	(r20395)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:18 2024	(r20396)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.5.28-pre
+### libopenmpt 0.5.28 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory
     allocation (64bit platforms) when reading close to 4GiB of data from

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:18 2024	(r20395)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:18 2024	(r20396)
@@ -21,9 +21,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 28
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:18 2024	(r20395)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:18 2024	(r20396)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=5
 LIBOPENMPT_VERSION_PATCH=28
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=2
 LIBOPENMPT_LTVER_REVISION=28

[OMPT-svn-commit] OpenMPT r20395 - branches/OpenMPT-1.29/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:18 2024
New Revision: 20395
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20395

Log:
[Mod] OpenMPT: Version is now 1.29.15.28

Modified:
   branches/OpenMPT-1.29/common/versionNumber.h

Modified: branches/OpenMPT-1.29/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.29/common/versionNumber.h	Sun Mar 17 08:44:55 2024	(r20394)
+++ branches/OpenMPT-1.29/common/versionNumber.h	Sun Mar 17 08:45:18 2024	(r20395)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      29
 #define VER_MINOR      15
-#define VER_MINORMINOR 27
+#define VER_MINORMINOR 28
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20398 - in branches/OpenMPT-1.29/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:45:20 2024
New Revision: 20398
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20398

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:19 2024	(r20397)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar 17 08:45:20 2024	(r20398)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.5.29-pre
+
 ### libopenmpt 0.5.28 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:19 2024	(r20397)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:45:20 2024	(r20398)
@@ -19,11 +19,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 5
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 28
+#define OPENMPT_API_VERSION_PATCH 29
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:19 2024	(r20397)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:45:20 2024	(r20398)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=5
-LIBOPENMPT_VERSION_PATCH=28
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=29
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=2
-LIBOPENMPT_LTVER_REVISION=28
+LIBOPENMPT_LTVER_REVISION=29
 LIBOPENMPT_LTVER_AGE=2

[OMPT-svn-commit] OpenMPT r20394 - branches/OpenMPT-1.30/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:55 2024
New Revision: 20394
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20394

Log:
[Mod] OpenMPT: Version is now 1.30.12.09

Modified:
   branches/OpenMPT-1.30/common/versionNumber.h

Modified: branches/OpenMPT-1.30/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.30/common/versionNumber.h	Sun Mar 17 08:44:55 2024	(r20393)
+++ branches/OpenMPT-1.30/common/versionNumber.h	Sun Mar 17 08:44:55 2024	(r20394)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      30
 #define VER_MINOR      12
-#define VER_MINORMINOR 08
+#define VER_MINORMINOR 09
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20390 - branches/OpenMPT-1.30/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:52 2024
New Revision: 20390
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20390

Log:
[Mod] OpenMPT: Version is now 1.30.12.08

Modified:
   branches/OpenMPT-1.30/common/versionNumber.h

Modified: branches/OpenMPT-1.30/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.30/common/versionNumber.h	Sun Mar 17 08:44:32 2024	(r20389)
+++ branches/OpenMPT-1.30/common/versionNumber.h	Sun Mar 17 08:44:52 2024	(r20390)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      30
 #define VER_MINOR      12
-#define VER_MINORMINOR 07
+#define VER_MINORMINOR 08
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20393 - in branches/OpenMPT-1.30/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:55 2024
New Revision: 20393
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20393

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Mar 17 08:44:54 2024	(r20392)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Mar 17 08:44:55 2024	(r20393)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.6.15-pre
+
 ### libopenmpt 0.6.14 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:54 2024	(r20392)
+++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:55 2024	(r20393)
@@ -21,11 +21,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 6
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 14
+#define OPENMPT_API_VERSION_PATCH 15
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:54 2024	(r20392)
+++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:55 2024	(r20393)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=6
-LIBOPENMPT_VERSION_PATCH=14
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=15
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=3
-LIBOPENMPT_LTVER_REVISION=14
+LIBOPENMPT_LTVER_REVISION=15
 LIBOPENMPT_LTVER_AGE=3

[OMPT-svn-commit] OpenMPT r20392 - tags/libopenmpt-0.6.14

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:54 2024
New Revision: 20392
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20392

Log:
tag libopenmpt-0.6.14

Added:
   tags/libopenmpt-0.6.14/   (props changed)
      - copied from r20391, branches/OpenMPT-1.30/

[OMPT-svn-commit] OpenMPT r20391 - in branches/OpenMPT-1.30/libopenmpt: . dox

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:53 2024
New Revision: 20391
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20391

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Mar 17 08:44:52 2024	(r20390)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Mar 17 08:44:53 2024	(r20391)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.6.14-pre
+### libopenmpt 0.6.14 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory
     allocation (64bit platforms) when reading close to 4GiB of data from

Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:52 2024	(r20390)
+++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:53 2024	(r20391)
@@ -23,9 +23,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 14
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:52 2024	(r20390)
+++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:53 2024	(r20391)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=6
 LIBOPENMPT_VERSION_PATCH=14
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=3
 LIBOPENMPT_LTVER_REVISION=14

[OMPT-svn-commit] OpenMPT r20389 - in branches/OpenMPT-1.31: doc/libopenmpt libopenmpt

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:32 2024
New Revision: 20389
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20389

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Mar 17 08:44:31 2024	(r20388)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Mar 17 08:44:32 2024	(r20389)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.7.6-pre
+
 ### libopenmpt 0.7.5 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:31 2024	(r20388)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:32 2024	(r20389)
@@ -21,11 +21,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 7
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 5
+#define OPENMPT_API_VERSION_PATCH 6
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:31 2024	(r20388)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:32 2024	(r20389)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=7
-LIBOPENMPT_VERSION_PATCH=5
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=6
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=4
-LIBOPENMPT_LTVER_REVISION=5
+LIBOPENMPT_LTVER_REVISION=6
 LIBOPENMPT_LTVER_AGE=4

[OMPT-svn-commit] OpenMPT r20388 - tags/libopenmpt-0.7.5

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:31 2024
New Revision: 20388
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20388

Log:
tag libopenmpt-0.7.5

Added:
   tags/libopenmpt-0.7.5/   (props changed)
      - copied from r20387, branches/OpenMPT-1.31/

[OMPT-svn-commit] OpenMPT r20387 - in branches/OpenMPT-1.31: doc/libopenmpt libopenmpt

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:44:29 2024
New Revision: 20387
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20387

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Mar 17 08:42:51 2024	(r20386)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Mar 17 08:44:29 2024	(r20387)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.7.5-pre
+### libopenmpt 0.7.5 (2024-03-17)
 
  *  [**Sec**] Null-pointer write (32bit platforms) or excessive memory
     allocation (64bit platforms) when reading close to 4GiB of data from

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:42:51 2024	(r20386)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Mar 17 08:44:29 2024	(r20387)
@@ -23,9 +23,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 5
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:42:51 2024	(r20386)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Mar 17 08:44:29 2024	(r20387)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=7
 LIBOPENMPT_VERSION_PATCH=5
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=4
 LIBOPENMPT_LTVER_REVISION=5

[OMPT-svn-commit] OpenMPT r20386 - branches/OpenMPT-1.31/common

[<sv...@op...>]

Author: manx
Date: Sun Mar 17 08:42:51 2024
New Revision: 20386
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20386

Log:
[Mod] OpenMPT: Version is now 1.31.05.02

Modified:
   branches/OpenMPT-1.31/common/versionNumber.h

Modified: branches/OpenMPT-1.31/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.31/common/versionNumber.h	Sat Mar 16 23:54:24 2024	(r20385)
+++ branches/OpenMPT-1.31/common/versionNumber.h	Sun Mar 17 08:42:51 2024	(r20386)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
 #define VER_MINOR      05
-#define VER_MINORMINOR 01
+#define VER_MINORMINOR 02
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20385 - trunk/OpenMPT/soundlib/plugins/dmo

[<sv...@op...>]

Author: sagamusix
Date: Sat Mar 16 23:54:24 2024
New Revision: 20385
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20385

Log:
[Mod] Compressor DMO: Similar to Chorus / Flanger, avoid chance of reading from the wrong buffer offset at extremely high sample rates. In this particular case, the mix rate needs to be above 500 kHz before the overflow would occur.

Modified:
   trunk/OpenMPT/soundlib/plugins/dmo/Compressor.cpp

Modified: trunk/OpenMPT/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/dmo/Compressor.cpp	Sat Mar 16 23:00:16 2024	(r20384)
+++ trunk/OpenMPT/soundlib/plugins/dmo/Compressor.cpp	Sat Mar 16 23:54:24 2024	(r20385)
@@ -88,10 +88,10 @@
 		}
 		compGainPow >>= (31 - compGainInt);
 		
-		int32 readOffset = m_predelay + m_bufPos * 4096 + m_bufSize - 1;
+		int32 readOffset = m_predelay + m_bufSize - 1;
 		readOffset /= 4096;
-		readOffset %= m_bufSize;
-		
+		readOffset = (readOffset + m_bufPos) % m_bufSize;
+
 		float outGain = (static_cast<float>(compGainPow) * (1.0f / 2147483648.0f)) * m_gain;
 		*(out[0])++ = m_buffer[readOffset * 2] * outGain;
 		*(out[1])++ = m_buffer[readOffset * 2 + 1] * outGain;