[OMPT-svn-commit] OpenMPT r22402 - in branches/OpenMPT-1.28: . soundlib

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

Author: sagamusix
Date: Sun Dec  1 13:15:41 2024
New Revision: 22402
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22402

Log:
Merged revision(s) 22401 from branches/OpenMPT-1.29:
[Fix] Fix compilation.
........

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

Modified: branches/OpenMPT-1.28/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 13:15:19 2024	(r22401)
+++ branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 13:15:41 2024	(r22402)
@@ -1248,13 +1248,7 @@
 				if(++emptySampleReferences > 1)
 				{
 #ifdef MPT_EXTERNAL_SAMPLES
-					mpt::ustring filenameHint;
-					if(!file.GetFileName().empty())
-					{
-						const auto filename = file.GetFileName().GetFilename().ToUnicode();
-						filenameHint = mpt::format(U_(" ({}.nt or {}.as)"))(filename, filename);
-					}
-					AddToLog(LogWarning, mpt::format(U_("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play."))(filenameHint));
+					AddToLog(LogWarning, U_("This Startrekker AM file is most likely missing its companion file. Synthesized instruments will not play."));
 #else
 					AddToLog(LogWarning, U_("This appears to be a Startrekker AM file with external synthesizes instruments. External instruments are currently not supported."));
 #endif  // MPT_EXTERNAL_SAMPLES