[OMPT-svn-commit] OpenMPT r22383 - in branches/OpenMPT-1.30: . soundlib

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

Author: sagamusix
Date: Sun Dec  1 12:37:48 2024
New Revision: 22383
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22383

Log:
Merged revision(s) 22381 from trunk/OpenMPT:
[Ref] Avoid warnings in !MPT_EXTERNAL_SAMPLES mode.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Load_mod.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_mod.cpp	Sun Dec  1 12:37:30 2024	(r22382)
+++ branches/OpenMPT-1.30/soundlib/Load_mod.cpp	Sun Dec  1 12:37:48 2024	(r22383)
@@ -1313,13 +1313,13 @@
 			{
 				if(++emptySampleReferences > 1)
 				{
+#ifdef MPT_EXTERNAL_SAMPLES
 					mpt::ustring filenameHint;
 					if(file.GetOptionalFileName())
 					{
 						const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode();
 						filenameHint = MPT_UFORMAT(" ({}.nt or {}.as)")(filename, filename);
 					}
-#ifdef MPT_EXTERNAL_SAMPLES
 					AddToLog(LogWarning, MPT_UFORMAT("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play.")(filenameHint));
 #else
 					AddToLog(LogWarning, U_("This appears to be a Startrekker AM file with external synthesizes instruments. External instruments are currently not supported."));