[OMPT-svn-commit] OpenMPT r20435 - in trunk/OpenMPT: mptrack soundlib

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

Author: sagamusix
Date: Sat Mar 23 20:41:28 2024
New Revision: 20435
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20435

Log:
[Ref] Small changes.

Modified:
   trunk/OpenMPT/mptrack/Modedit.cpp
   trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp
   trunk/OpenMPT/soundlib/patternContainer.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	Sat Mar 23 20:40:09 2024	(r20434)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	Sat Mar 23 20:41:28 2024	(r20435)
@@ -610,7 +610,7 @@
 		}
 
 		plug.Destroy();
-		plug = {};
+		mpt::reconstruct(plug);
 
 		for(PLUGINDEX srcPlugSlot = 0; srcPlugSlot < nPlug; srcPlugSlot++)
 		{

Modified: trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp	Sat Mar 23 20:40:09 2024	(r20434)
+++ trunk/OpenMPT/soundlib/SampleFormatSFZ.cpp	Sat Mar 23 20:41:28 2024	(r20435)
@@ -1130,7 +1130,7 @@
 	case TempoMode::Modern:
 		f << ", " << m_PlayState.m_nMusicSpeed << " ticks per row, " << m_PlayState.m_nCurrentRowsPerBeat << " rows per beat (modern tempo mode)";
 		break;
-	default:
+	case TempoMode::NumModes:
 		MPT_ASSERT_NOTREACHED();
 		break;
 	}

Modified: trunk/OpenMPT/soundlib/patternContainer.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/patternContainer.cpp	Sat Mar 23 20:40:09 2024	(r20434)
+++ trunk/OpenMPT/soundlib/patternContainer.cpp	Sat Mar 23 20:41:28 2024	(r20435)
@@ -182,7 +182,7 @@
 PATTERNINDEX CPatternContainer::GetRemainingCapacity() const noexcept
 {
 	PATTERNINDEX numRemaining = m_rSndFile.GetModSpecifications().patternsMax;
-	const PATTERNINDEX size = std::min(Size(), m_rSndFile.GetModSpecifications().patternsMax);
+	const PATTERNINDEX size = std::min(Size(), numRemaining);
 	for(PATTERNINDEX pat = 0; pat < size; pat++)
 	{
 		if(m_Patterns[pat].IsValid())