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

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

Author: sagamusix
Date: Tue May  7 23:23:30 2024
New Revision: 20721
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20721

Log:
[Fix] Mark header functions as inline / move to implementation file.

Modified:
   trunk/OpenMPT/soundlib/MODTools.cpp
   trunk/OpenMPT/soundlib/MODTools.h

Modified: trunk/OpenMPT/soundlib/MODTools.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/MODTools.cpp	Tue May  7 23:15:15 2024	(r20720)
+++ trunk/OpenMPT/soundlib/MODTools.cpp	Tue May  7 23:23:30 2024	(r20721)
@@ -296,6 +296,23 @@
 }
 
 
+uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn)
+{
+	sampleHeader.ConvertToMPT(sample, is4Chn);
+	sampleName = mpt::String::ReadBuf(mpt::String::spacePadded, sampleHeader.name);
+	// Get rid of weird characters in sample names.
+	for(auto &c : sampleName.buf)
+	{
+		if(c > 0 && c < ' ')
+		{
+			c = ' ';
+		}
+	}
+	// Check for invalid values
+	return sampleHeader.GetInvalidByteScore();
+}
+
+
 // Count malformed bytes in MOD pattern data
 uint32 CountMalformedMODPatternData(const MODPatternData &patternData, const bool extendedFormat)
 {

Modified: trunk/OpenMPT/soundlib/MODTools.h
==============================================================================
--- trunk/OpenMPT/soundlib/MODTools.h	Tue May  7 23:15:15 2024	(r20720)
+++ trunk/OpenMPT/soundlib/MODTools.h	Tue May  7 23:23:30 2024	(r20721)
@@ -79,7 +79,7 @@
 using MODPatternData = std::array<std::array<std::array<uint8, 4>, 4>, 64>;
 
 // Check if header magic equals a given string.
-static bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept
+static inline bool IsMagic(const char *magic1, const char (&magic2)[5]) noexcept
 {
 	return std::memcmp(magic1, magic2, 4) == 0;
 }
@@ -103,21 +103,8 @@
 }
 
 
-static uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn)
-{
-	sampleHeader.ConvertToMPT(sample, is4Chn);
-	sampleName = mpt::String::ReadBuf(mpt::String::spacePadded, sampleHeader.name);
-	// Get rid of weird characters in sample names.
-	for(auto &c : sampleName.buf)
-	{
-		if(c > 0 && c < ' ')
-		{
-			c = ' ';
-		}
-	}
-	// Check for invalid values
-	return sampleHeader.GetInvalidByteScore();
-}
+// Convert MOD sample header and validate
+uint32 ReadMODSample(const MODSampleHeader &sampleHeader, ModSample &sample, mpt::charbuf<MAX_SAMPLENAME> &sampleName, bool is4Chn);
 
 
 // Count malformed bytes in MOD pattern data