From: <sv...@op...> - 2024-12-01 11:37:41
|
Author: sagamusix Date: Sun Dec 1 12:37:30 2024 New Revision: 22382 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22382 Log: Merged revision(s) 22381 from trunk/OpenMPT: [Ref] Avoid warnings in !MPT_EXTERNAL_SAMPLES mode. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Sun Dec 1 12:37:09 2024 (r22381) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Sun Dec 1 12:37:30 2024 (r22382) @@ -1355,13 +1355,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.")); |