Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21158 - trunk/OpenMPT/soundlib
|
From: <sv...@op...> - 2024-07-13 23:44:56
|
Author: sagamusix Date: Sun Jul 14 01:44:35 2024 New Revision: 21158 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21158 Log: [Ref] Consistently use unicode literals instead of move-constructing strings for metadata in module loaders to reduce binary bloat. Modified: trunk/OpenMPT/soundlib/Load_669.cpp trunk/OpenMPT/soundlib/Load_amf.cpp trunk/OpenMPT/soundlib/Load_ams.cpp trunk/OpenMPT/soundlib/Load_c67.cpp trunk/OpenMPT/soundlib/Load_dbm.cpp trunk/OpenMPT/soundlib/Load_digi.cpp trunk/OpenMPT/soundlib/Load_dmf.cpp trunk/OpenMPT/soundlib/Load_dsm.cpp trunk/OpenMPT/soundlib/Load_dsym.cpp trunk/OpenMPT/soundlib/Load_dtm.cpp trunk/OpenMPT/soundlib/Load_far.cpp trunk/OpenMPT/soundlib/Load_fmt.cpp trunk/OpenMPT/soundlib/Load_ftm.cpp trunk/OpenMPT/soundlib/Load_gdm.cpp trunk/OpenMPT/soundlib/Load_gmc.cpp trunk/OpenMPT/soundlib/Load_gt2.cpp trunk/OpenMPT/soundlib/Load_ice.cpp trunk/OpenMPT/soundlib/Load_imf.cpp trunk/OpenMPT/soundlib/Load_it.cpp trunk/OpenMPT/soundlib/Load_itp.cpp trunk/OpenMPT/soundlib/Load_kris.cpp trunk/OpenMPT/soundlib/Load_mdl.cpp trunk/OpenMPT/soundlib/Load_mid.cpp trunk/OpenMPT/soundlib/Load_mo3.cpp trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Load_mt2.cpp trunk/OpenMPT/soundlib/Load_mtm.cpp trunk/OpenMPT/soundlib/Load_mus_km.cpp trunk/OpenMPT/soundlib/Load_okt.cpp trunk/OpenMPT/soundlib/Load_plm.cpp trunk/OpenMPT/soundlib/Load_psm.cpp trunk/OpenMPT/soundlib/Load_pt36.cpp trunk/OpenMPT/soundlib/Load_ptm.cpp trunk/OpenMPT/soundlib/Load_rtm.cpp trunk/OpenMPT/soundlib/Load_sfx.cpp trunk/OpenMPT/soundlib/Load_stk.cpp trunk/OpenMPT/soundlib/Load_stm.cpp trunk/OpenMPT/soundlib/Load_stp.cpp trunk/OpenMPT/soundlib/Load_symmod.cpp trunk/OpenMPT/soundlib/Load_uax.cpp trunk/OpenMPT/soundlib/Load_ult.cpp trunk/OpenMPT/soundlib/Load_wav.cpp trunk/OpenMPT/soundlib/Load_xm.cpp trunk/OpenMPT/soundlib/load_j2b.cpp Modified: trunk/OpenMPT/soundlib/Load_669.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_669.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_669.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -147,8 +147,8 @@ //m_SongFlags.set(SONG_LINEARSLIDES); #endif // MODPLUG_TRACKER - m_modFormat.formatName = U_("Composer 669"); - m_modFormat.type = U_("669"); + m_modFormat.formatName = UL_("Composer 669"); + m_modFormat.type = UL_("669"); m_modFormat.madeWithTracker = !memcmp(fileHeader.magic, "if", 2) ? UL_("Composer 669") : UL_("UNIS 669"); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_amf.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_amf.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_amf.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -135,8 +135,8 @@ Order().SetRestartPos(fileHeader.restartPos); } - m_modFormat.formatName = U_("ASYLUM Music Format"); - m_modFormat.type = U_("amf"); + m_modFormat.formatName = UL_("ASYLUM Music Format"); + m_modFormat.type = UL_("amf"); m_modFormat.charset = mpt::Charset::CP437; uint8 orders[256]; @@ -578,12 +578,12 @@ if(isDMF) { m_modFormat.formatName = MPT_UFORMAT("DSMI Advanced Music Format (Compact) v{}")(fileSignature.version); - m_modFormat.type = U_("dmf"); + m_modFormat.type = UL_("dmf"); } else { m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, title); m_modFormat.formatName = MPT_UFORMAT("DSMI Advanced Music Format v{}")(fileSignature.version); - m_modFormat.type = U_("amf"); + m_modFormat.type = UL_("amf"); } m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_ams.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ams.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_ams.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -406,8 +406,8 @@ m_nSamples = fileHeader.numSamps; SetupMODPanning(true); - m_modFormat.formatName = U_("Extreme's Tracker"); - m_modFormat.type = U_("ams"); + m_modFormat.formatName = UL_("Extreme's Tracker"); + m_modFormat.type = UL_("ams"); m_modFormat.madeWithTracker = MPT_UFORMAT("Extreme's Tracker {}.{}")(fileHeader.versionHigh, fileHeader.versionLow); m_modFormat.charset = mpt::Charset::CP437; @@ -779,8 +779,8 @@ m_nInstruments = fileHeader.numIns; SetupMODPanning(true); - m_modFormat.formatName = U_("Velvet Studio"); - m_modFormat.type = U_("ams"); + m_modFormat.formatName = UL_("Velvet Studio"); + m_modFormat.type = UL_("ams"); m_modFormat.madeWithTracker = MPT_UFORMAT("Velvet Studio {}.{}")(fileHeader.versionHigh.get(), mpt::ufmt::dec0<2>(fileHeader.versionLow.get())); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_c67.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_c67.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_c67.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -159,9 +159,9 @@ InitializeGlobals(MOD_TYPE_S3M, 4 + 9); - m_modFormat.formatName = U_("CDFM"); - m_modFormat.type = U_("c67"); - m_modFormat.madeWithTracker = U_("Composer 670"); + m_modFormat.formatName = UL_("CDFM"); + m_modFormat.type = UL_("c67"); + m_modFormat.madeWithTracker = UL_("Composer 670"); m_modFormat.charset = mpt::Charset::CP437; Order().SetDefaultSpeed(fileHeader.speed); Modified: trunk/OpenMPT/soundlib/Load_dbm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dbm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_dbm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -390,8 +390,8 @@ m_playBehaviour.reset(kITInstrWithNoteOff); m_playBehaviour.reset(kITInstrWithNoteOffOldEffects); - m_modFormat.formatName = U_("DigiBooster Pro"); - m_modFormat.type = U_("dbm"); + m_modFormat.formatName = UL_("DigiBooster Pro"); + m_modFormat.type = UL_("dbm"); m_modFormat.madeWithTracker = MPT_UFORMAT("DigiBooster Pro {}.{}")(mpt::ufmt::hex(fileHeader.trkVerHi), mpt::ufmt::hex(fileHeader.trkVerLo)); m_modFormat.charset = mpt::Charset::Amiga_no_C1; Modified: trunk/OpenMPT/soundlib/Load_digi.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_digi.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_digi.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -123,8 +123,8 @@ m_nSamples = 31; m_nSamplePreAmp = 256 / GetNumChannels(); - m_modFormat.formatName = U_("DigiBooster"); - m_modFormat.type = U_("digi"); + m_modFormat.formatName = UL_("DigiBooster"); + m_modFormat.type = UL_("digi"); m_modFormat.madeWithTracker = MPT_UFORMAT("Digi Booster {}.{}")(fileHeader.versionInt >> 4, fileHeader.versionInt & 0x0F); m_modFormat.charset = mpt::Charset::Amiga_no_C1; Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dmf.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_dmf.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -952,7 +952,7 @@ m_modFormat.formatName = MPT_UFORMAT("Delusion Digital Music Format v{}")(fileHeader.version); m_modFormat.madeWithTracker = fileHeader.version == 10 ? UL_("X-Tracker 32") : UL_("X-Tracker"); - m_modFormat.type = U_("dmf"); + m_modFormat.type = UL_("dmf"); m_modFormat.charset = mpt::Charset::CP437; m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, fileHeader.songname); Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dsm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_dsm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -208,8 +208,8 @@ InitializeGlobals(MOD_TYPE_DSM, std::max(songHeader.numChannels.get(), uint16(1))); - m_modFormat.formatName = U_("DSIK Format"); - m_modFormat.type = U_("dsm"); + m_modFormat.formatName = UL_("DSIK Format"); + m_modFormat.type = UL_("dsm"); m_modFormat.charset = mpt::Charset::CP437; m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, songHeader.songName); @@ -515,8 +515,8 @@ } } - m_modFormat.formatName = U_("Dynamic Studio"); - m_modFormat.type = U_("dsm"); + m_modFormat.formatName = UL_("Dynamic Studio"); + m_modFormat.type = UL_("dsm"); m_modFormat.charset = mpt::Charset::CP437; return true; Modified: trunk/OpenMPT/soundlib/Load_dsym.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dsym.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_dsym.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -601,8 +601,8 @@ } m_modFormat.formatName = MPT_UFORMAT("Digital Symphony v{}")(fileHeader.version); - m_modFormat.type = U_("dsym"); // RISC OS doesn't use file extensions but this is a common abbreviation used for this tracker - m_modFormat.madeWithTracker = U_("Digital Symphony"); + m_modFormat.type = UL_("dsym"); // RISC OS doesn't use file extensions but this is a common abbreviation used for this tracker + m_modFormat.madeWithTracker = UL_("Digital Symphony"); m_modFormat.charset = mpt::Charset::RISC_OS; return true; Modified: trunk/OpenMPT/soundlib/Load_dtm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dtm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_dtm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -573,20 +573,20 @@ mpt::ustring tracker; if(patternFormat == DTM_206_PATTERN_FORMAT) { - tracker = U_("Digital Home Studio"); + tracker = UL_("Digital Home Studio"); } else if(patternFormat == DTM_PT_PATTERN_FORMAT) { - tracker = U_("Digital Tracker 2.3"); + tracker = UL_("Digital Tracker 2.3"); } else if(FileReader chunk = chunks.GetChunk(DTMChunk::idVERS)) { uint32 version = chunk.ReadUint32BE(); tracker = MPT_UFORMAT("Digital Tracker {}.{}")(version >> 4, version & 0x0F); } else { - tracker = U_("Digital Tracker"); + tracker = UL_("Digital Tracker"); } - m_modFormat.formatName = U_("Digital Tracker"); - m_modFormat.type = U_("dtm"); + m_modFormat.formatName = UL_("Digital Tracker"); + m_modFormat.type = UL_("dtm"); m_modFormat.madeWithTracker = std::move(tracker); m_modFormat.charset = mpt::Charset::Amiga_no_C1; Modified: trunk/OpenMPT/soundlib/Load_far.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_far.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_far.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -170,8 +170,8 @@ m_SongFlags = SONG_LINEARSLIDES | SONG_AUTO_TONEPORTA | SONG_AUTO_TONEPORTA_CONT; m_playBehaviour.set(kPeriodsAreHertz); - m_modFormat.formatName = U_("Farandole Composer"); - m_modFormat.type = U_("far"); + m_modFormat.formatName = UL_("Farandole Composer"); + m_modFormat.type = UL_("far"); m_modFormat.charset = mpt::Charset::CP437; m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songName); Modified: trunk/OpenMPT/soundlib/Load_fmt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_fmt.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_fmt.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -182,8 +182,8 @@ m->param = delay; } - m_modFormat.formatName = U_("FM Tracker"); - m_modFormat.type = U_("fmt"); + m_modFormat.formatName = UL_("FM Tracker"); + m_modFormat.type = UL_("fmt"); m_modFormat.madeWithTracker = mpt::ToUnicode(mpt::Charset::CP437, mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.trackerName)); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ftm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_ftm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -124,9 +124,9 @@ m_nMaxPeriod = 5376; const bool moduleWithSamples = (fileHeader.flags & 0x01); - m_modFormat.formatName = U_("Face The Music"); - m_modFormat.type = U_("ftm"); - m_modFormat.madeWithTracker = U_("Face The Music"); + m_modFormat.formatName = UL_("Face The Music"); + m_modFormat.type = UL_("ftm"); + m_modFormat.madeWithTracker = UL_("Face The Music"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; m_songName = mpt::String::ReadBuf(mpt::String::nullTerminated, fileHeader.title); Modified: trunk/OpenMPT/soundlib/Load_gdm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_gdm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_gdm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -171,8 +171,8 @@ InitializeGlobals(gdmFormatOrigin[fileHeader.originalFormat], fileHeader.GetNumChannels()); m_SongFlags.set(SONG_IMPORTED); - m_modFormat.formatName = U_("General Digital Music"); - m_modFormat.type = U_("gdm"); + m_modFormat.formatName = UL_("General Digital Music"); + m_modFormat.type = UL_("gdm"); m_modFormat.madeWithTracker = MPT_UFORMAT("BWSB 2GDM {}.{}")(fileHeader.trackerMajorVer, fileHeader.formatMinorVer); m_modFormat.originalType = gdmFormatOriginType[fileHeader.originalFormat]; m_modFormat.originalFormatName = gdmFormatOriginFormat[fileHeader.originalFormat]; Modified: trunk/OpenMPT/soundlib/Load_gmc.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_gmc.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_gmc.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -229,8 +229,8 @@ } } - m_modFormat.madeWithTracker = U_("Game Music Creator"); - m_modFormat.formatName = U_("Game Music Creator"); + m_modFormat.madeWithTracker = UL_("Game Music Creator"); + m_modFormat.formatName = UL_("Game Music Creator"); m_modFormat.type = UL_("GMC"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; // No strings in this format... Modified: trunk/OpenMPT/soundlib/Load_gt2.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_gt2.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_gt2.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -538,9 +538,9 @@ m_playBehaviour.set(kApplyOffsetWithoutNote); SetupMODPanning(true); - m_modFormat.madeWithTracker = U_("Graoumf Tracker"); + m_modFormat.madeWithTracker = UL_("Graoumf Tracker"); m_modFormat.formatName = MPT_UFORMAT("Graoumf Tracker v{}")(fileHeader.fileVersion); - m_modFormat.type = U_("gtk"); + m_modFormat.type = UL_("gtk"); m_modFormat.charset = mpt::Charset::ISO8859_1_no_C1; m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, fileHeader.songName); @@ -1211,7 +1211,7 @@ m_modFormat.madeWithTracker = mpt::ToUnicode(mpt::Charset::ASCII, mpt::String::ReadBuf(mpt::String::spacePadded, fileHeader.trackerName)); m_modFormat.formatName = (fileHeader.fileVersion <= 5 ? MPT_UFORMAT("Graoumf Tracker v{}") : MPT_UFORMAT("Graoumf Tracker 2 v{}"))(fileHeader.fileVersion); - m_modFormat.type = U_("gt2"); + m_modFormat.type = UL_("gt2"); m_modFormat.charset = mpt::Charset::ISO8859_1_no_C1; m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, fileHeader.songName); Modified: trunk/OpenMPT/soundlib/Load_ice.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ice.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_ice.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -64,16 +64,16 @@ if(IsMagic(magic, "MTN\0")) { InitializeGlobals(MOD_TYPE_MOD, 4); - m_modFormat.formatName = U_("MnemoTroN SoundTracker"); - m_modFormat.type = U_("st26"); - m_modFormat.madeWithTracker = U_("SoundTracker 2.6"); + m_modFormat.formatName = UL_("MnemoTroN SoundTracker"); + m_modFormat.type = UL_("st26"); + m_modFormat.madeWithTracker = UL_("SoundTracker 2.6"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; } else if(IsMagic(magic, "IT10")) { InitializeGlobals(MOD_TYPE_MOD, 4); - m_modFormat.formatName = U_("Ice Tracker"); - m_modFormat.type = U_("ice"); - m_modFormat.madeWithTracker = U_("Ice Tracker 1.0 / 1.1"); + m_modFormat.formatName = UL_("Ice Tracker"); + m_modFormat.type = UL_("ice"); + m_modFormat.madeWithTracker = UL_("Ice Tracker 1.0 / 1.1"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; } else { Modified: trunk/OpenMPT/soundlib/Load_imf.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_imf.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_imf.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -431,8 +431,8 @@ InitializeGlobals(MOD_TYPE_IMF, fileHeader.GetNumChannels()); - m_modFormat.formatName = U_("Imago Orpheus"); - m_modFormat.type = U_("imf"); + m_modFormat.formatName = UL_("Imago Orpheus"); + m_modFormat.type = UL_("imf"); m_modFormat.charset = mpt::Charset::CP437; // Read channel configuration Modified: trunk/OpenMPT/soundlib/Load_it.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_it.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_it.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -490,7 +490,7 @@ { // ModPlug Tracker b3.2 - 1.09, instruments 557 bytes apart m_dwLastSavedWithVersion = MPT_V("1.09.00.00"); - madeWithTracker = U_("ModPlug Tracker b3.2 - 1.09"); + madeWithTracker = UL_("ModPlug Tracker b3.2 - 1.09"); interpretModPlugMade = true; } else if(fileHeader.cwtv == 0x0300 && fileHeader.cmwt == 0x0300 && fileHeader.reserved == 0 && fileHeader.ordnum == 256 && fileHeader.sep == 128 && fileHeader.pwd == 0) { @@ -610,13 +610,13 @@ } if(oldUNMO3) { - madeWithTracker = U_("UNMO3 <= 2.4"); + madeWithTracker = UL_("UNMO3 <= 2.4"); } } if(possiblyUNMO3 && fileHeader.cwtv == 0) { - madeWithTracker = U_("UNMO3 v0/1"); + madeWithTracker = UL_("UNMO3 v0/1"); } // Reading IT Edit History Info @@ -642,9 +642,9 @@ if(possiblyUNMO3 && nflt == 0) { if(fileHeader.special & ITFileHeader::embedPatternHighlights) - madeWithTracker = U_("UNMO3 <= 2.4.0.1"); // Set together with MIDI macro embed flag + madeWithTracker = UL_("UNMO3 <= 2.4.0.1"); // Set together with MIDI macro embed flag else - madeWithTracker = U_("UNMO3"); // Either 2.4.0.2+ or no MIDI macros embedded + madeWithTracker = UL_("UNMO3"); // Either 2.4.0.2+ or no MIDI macros embedded } } else { @@ -659,7 +659,7 @@ // Otherwise we end up here and might have to read the edit history length. if(file.ReadUint16LE() == 0) { - madeWithTracker = U_("UNMO3 <= 2.4"); + madeWithTracker = UL_("UNMO3 <= 2.4"); } else { // These were not zero bytes, but potentially belong to the upcoming MIDI config - need to skip back. @@ -711,7 +711,7 @@ || memchr(fileHeader.chnpan, 0xFF, sizeof(fileHeader.chnpan)) != nullptr) { m_dwLastSavedWithVersion = MPT_V("1.16"); - madeWithTracker = U_("ModPlug Tracker 1.09 - 1.16"); + madeWithTracker = UL_("ModPlug Tracker 1.09 - 1.16"); } else { // OpenMPT 1.17 disguised as this in compatible mode, @@ -719,7 +719,7 @@ // It also doesn't write a final "---" pattern in the order list. // Could also be original ModPlug Tracker though if all 64 channels and no ModPlug extensions are used. m_dwLastSavedWithVersion = MPT_V("1.17"); - madeWithTracker = U_("OpenMPT 1.17 (compatibility export)"); + madeWithTracker = UL_("OpenMPT 1.17 (compatibility export)"); } interpretModPlugMade = true; } @@ -856,7 +856,7 @@ possibleXMconversion = false; } if(possibleXMconversion) - madeWithTracker = U_("XM Conversion"); + madeWithTracker = UL_("XM Conversion"); } m_nMinPeriod = 0; @@ -1148,7 +1148,7 @@ if(m_dwLastSavedWithVersion && madeWithTracker.empty()) { - madeWithTracker = U_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); + madeWithTracker = UL_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); bool isCompatExport = memcmp(&fileHeader.reserved, "OMPT", 4) && (fileHeader.cwtv & 0xF000) == 0x5000; if(m_dwLastSavedWithVersion == MPT_V("1.17.00.00")) @@ -1156,10 +1156,10 @@ if(isCompatExport) { - madeWithTracker += U_(" (compatibility export)"); + madeWithTracker += UL_(" (compatibility export)"); } else if(m_dwLastSavedWithVersion.IsTestVersion()) { - madeWithTracker += U_(" (test build)"); + madeWithTracker += UL_(" (test build)"); } } else { @@ -1170,19 +1170,19 @@ if(isBeRoTracker) { // Old versions - madeWithTracker = U_("BeRoTracker"); + madeWithTracker = UL_("BeRoTracker"); } else if(fileHeader.cwtv == 0x0214 && fileHeader.cmwt == 0x0200 && fileHeader.flags == 9 && fileHeader.special == 0 && fileHeader.highlight_major == 0 && fileHeader.highlight_minor == 0 && fileHeader.insnum == 0 && fileHeader.patnum + 1 == fileHeader.ordnum && fileHeader.globalvol == 128 && fileHeader.mv == 100 && fileHeader.speed == 1 && fileHeader.sep == 128 && fileHeader.pwd == 0 && fileHeader.msglength == 0 && fileHeader.msgoffset == 0 && fileHeader.reserved == 0) { - madeWithTracker = U_("OpenSPC conversion"); + madeWithTracker = UL_("OpenSPC conversion"); } else if(fileHeader.cwtv == 0x0202 && fileHeader.cmwt == 0x0200 && fileHeader.highlight_major == 0 && fileHeader.highlight_minor == 0 && fileHeader.reserved == 0 && !patPos.empty() && !smpPos.empty() && patPos[0] != 0 && patPos[0] < smpPos[0]) { // ModPlug Tracker 1.0 pre-alpha up to alpha 4, patterns located before instruments / samples m_dwLastSavedWithVersion = MPT_V("1.00.00.A0"); - madeWithTracker = U_("ModPlug Tracker 1.0 pre-alpha / alpha"); + madeWithTracker = UL_("ModPlug Tracker 1.0 pre-alpha / alpha"); interpretModPlugMade = true; } else if(fileHeader.cwtv == 0x0214 && fileHeader.cmwt == 0x0200 && fileHeader.highlight_major == 0 && fileHeader.highlight_minor == 0 && fileHeader.reserved == 0) { @@ -1193,37 +1193,37 @@ if(insPos.size() >= 2 && insPos[1] - insPos[0] == 557) { m_dwLastSavedWithVersion = MPT_V("1.00.00.B2"); - madeWithTracker = U_("ModPlug Tracker 1.0b2"); + madeWithTracker = UL_("ModPlug Tracker 1.0b2"); } else { m_dwLastSavedWithVersion = MPT_V("1.00.00.B1"); - madeWithTracker = U_("ModPlug Tracker 1.0 alpha / beta"); + madeWithTracker = UL_("ModPlug Tracker 1.0 alpha / beta"); } } else { // ModPlug Tracker 1.0a5, instruments 560 bytes apart m_dwLastSavedWithVersion = MPT_V("1.00.00.A5"); - madeWithTracker = U_("ModPlug Tracker 1.0a5"); + madeWithTracker = UL_("ModPlug Tracker 1.0a5"); } interpretModPlugMade = true; } else if(fileHeader.cwtv == 0x0214 && fileHeader.cmwt == 0x0214 && !memcmp(&fileHeader.reserved, "CHBI", 4)) { - madeWithTracker = U_("ChibiTracker"); + madeWithTracker = UL_("ChibiTracker"); m_playBehaviour.reset(kITShortSampleRetrig); m_nSamplePreAmp /= 2; } else if(fileHeader.cwtv == 0x0214 && fileHeader.cmwt == 0x0214 && fileHeader.special <= 1 && fileHeader.pwd == 0 && fileHeader.reserved == 0 && (fileHeader.flags & (ITFileHeader::vol0Optimisations | ITFileHeader::instrumentMode | ITFileHeader::useMIDIPitchController | ITFileHeader::reqEmbeddedMIDIConfig | ITFileHeader::extendedFilterRange)) == ITFileHeader::instrumentMode && m_nSamples > 1 && (Samples[1].filename == "XXXXXXXX.YYY")) { - madeWithTracker = U_("CheeseTracker"); + madeWithTracker = UL_("CheeseTracker"); } else if(fileHeader.cwtv == 0 && madeWithTracker.empty()) { - madeWithTracker = U_("Unknown"); + madeWithTracker = UL_("Unknown"); } else if(fileHeader.cmwt < 0x0300 && madeWithTracker.empty()) { if(fileHeader.cmwt > 0x0214) { - madeWithTracker = U_("Impulse Tracker 2.15"); + madeWithTracker = UL_("Impulse Tracker 2.15"); } else if(fileHeader.cwtv > 0x0214) { // Patched update of IT 2.14 (0x0215 - 0x0217 == p1 - p3) @@ -1286,27 +1286,27 @@ madeWithTracker = MPT_UFORMAT("pyIT {}.{}")((fileHeader.cwtv & 0x0F00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF)); break; case 6: - madeWithTracker = U_("BeRoTracker"); + madeWithTracker = UL_("BeRoTracker"); break; case 7: if(fileHeader.cwtv == 0x7FFF && fileHeader.cmwt == 0x0215) - madeWithTracker = U_("munch.py"); + madeWithTracker = UL_("munch.py"); else madeWithTracker = MPT_UFORMAT("ITMCK {}.{}.{}")((fileHeader.cwtv >> 8) & 0x0F, (fileHeader.cwtv >> 4) & 0x0F, fileHeader.cwtv & 0x0F); break; case 0xD: if(fileHeader.cwtv == 0xDAEB) - madeWithTracker = U_("spc2it"); + madeWithTracker = UL_("spc2it"); else if(fileHeader.cwtv == 0xD1CE) - madeWithTracker = U_("itwriter"); + madeWithTracker = UL_("itwriter"); else - madeWithTracker = U_("Unknown"); + madeWithTracker = UL_("Unknown"); break; } } if(anyADPCM) - madeWithTracker += U_(" (ADPCM packed)"); + madeWithTracker += UL_(" (ADPCM packed)"); // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. // Example: denonde.it by Mystical Modified: trunk/OpenMPT/soundlib/Load_itp.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_itp.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_itp.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -417,9 +417,9 @@ m_MidiCfg.Reset(); } - m_modFormat.formatName = U_("Impulse Tracker Project"); - m_modFormat.type = U_("itp"); - m_modFormat.madeWithTracker = U_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); + m_modFormat.formatName = UL_("Impulse Tracker Project"); + m_modFormat.type = UL_("itp"); + m_modFormat.madeWithTracker = UL_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); m_modFormat.charset = mpt::Charset::Windows1252; return true; Modified: trunk/OpenMPT/soundlib/Load_kris.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_kris.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_kris.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -134,9 +134,9 @@ } } - m_modFormat.formatName = U_("ChipTracker"); - m_modFormat.type = U_("mod"); - m_modFormat.madeWithTracker = U_("ChipTracker"); + m_modFormat.formatName = UL_("ChipTracker"); + m_modFormat.type = UL_("mod"); + m_modFormat.madeWithTracker = UL_("ChipTracker"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; if(loadFlags & loadSampleData) Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mdl.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mdl.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -516,13 +516,13 @@ m_playBehaviour.reset(kITVibratoTremoloPanbrello); m_playBehaviour.reset(kITSCxStopsSample); // Gate effect in underbeat.mdl - m_modFormat.formatName = U_("Digitrakker"); - m_modFormat.type = U_("mdl"); + m_modFormat.formatName = UL_("Digitrakker"); + m_modFormat.type = UL_("mdl"); m_modFormat.madeWithTracker = U_("Digitrakker ") + ( - (fileHeader.version == 0x11) ? U_("3") // really could be 2.99b - close enough - : (fileHeader.version == 0x10) ? U_("2.3") - : (fileHeader.version == 0x00) ? U_("2.0 - 2.2b") // there was no 1.x release - : U_("")); + (fileHeader.version == 0x11) ? UL_("3") // really could be 2.99b - close enough + : (fileHeader.version == 0x10) ? UL_("2.3") + : (fileHeader.version == 0x00) ? UL_("2.0 - 2.2b") // there was no 1.x release + : UL_("")); m_modFormat.charset = mpt::Charset::CP437; m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, info.title); Modified: trunk/OpenMPT/soundlib/Load_mid.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mid.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mid.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -643,10 +643,10 @@ const ORDERINDEX MPT_MIDI_IMPORT_MAX_ORDERS = MAX_ORDERS; #endif - m_songArtist = U_("MIDI Conversion"); - m_modFormat.formatName = U_("Standard MIDI File"); + m_songArtist = UL_("MIDI Conversion"); + m_modFormat.formatName = UL_("Standard MIDI File"); m_modFormat.type = isRIFF ? UL_("rmi") : UL_("mid"); - m_modFormat.madeWithTracker = U_("Standard MIDI File"); + m_modFormat.madeWithTracker = UL_("Standard MIDI File"); m_modFormat.charset = mpt::Charset::ISO8859_1; SetMixLevels(MixLevels::v1_17RC3); Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mo3.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mo3.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -1489,7 +1489,7 @@ if(m_dwLastSavedWithVersion) { - madeWithTracker = U_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); + madeWithTracker = UL_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion); } break; } @@ -1537,36 +1537,36 @@ madeWithTracker = MPT_UFORMAT("MO3 v{} ({})")(version, madeWithTracker); m_modFormat.formatName = MPT_UFORMAT("Un4seen MO3 v{}")(version); - m_modFormat.type = U_("mo3"); + m_modFormat.type = UL_("mo3"); switch(GetType()) { case MOD_TYPE_MTM: - m_modFormat.originalType = U_("mtm"); - m_modFormat.originalFormatName = U_("MultiTracker"); + m_modFormat.originalType = UL_("mtm"); + m_modFormat.originalFormatName = UL_("MultiTracker"); break; case MOD_TYPE_MOD: - m_modFormat.originalType = U_("mod"); - m_modFormat.originalFormatName = U_("Generic MOD"); + m_modFormat.originalType = UL_("mod"); + m_modFormat.originalFormatName = UL_("Generic MOD"); break; case MOD_TYPE_XM: - m_modFormat.originalType = U_("xm"); - m_modFormat.originalFormatName = U_("FastTracker 2"); + m_modFormat.originalType = UL_("xm"); + m_modFormat.originalFormatName = UL_("FastTracker 2"); break; case MOD_TYPE_S3M: - m_modFormat.originalType = U_("s3m"); - m_modFormat.originalFormatName = U_("Scream Tracker 3"); + m_modFormat.originalType = UL_("s3m"); + m_modFormat.originalFormatName = UL_("Scream Tracker 3"); break; case MOD_TYPE_IT: - m_modFormat.originalType = U_("it"); + m_modFormat.originalType = UL_("it"); if(cmwt) m_modFormat.originalFormatName = MPT_UFORMAT("Impulse Tracker {}.{}")(cmwt >> 8, mpt::ufmt::hex0<2>(cmwt & 0xFF)); else - m_modFormat.originalFormatName = U_("Impulse Tracker"); + m_modFormat.originalFormatName = UL_("Impulse Tracker"); break; case MOD_TYPE_MPT: - m_modFormat.originalType = U_("mptm"); - m_modFormat.originalFormatName = U_("OpenMPT MPTM"); + m_modFormat.originalType = UL_("mptm"); + m_modFormat.originalFormatName = UL_("OpenMPT MPTM"); break; default: MPT_ASSERT_NOTREACHED(); Modified: trunk/OpenMPT/soundlib/Load_mod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mod.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mod.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -859,13 +859,13 @@ std::transform(std::begin(magic), std::end(magic), std::begin(magic), [](unsigned char c) -> unsigned char { return (c < ' ') ? ' ' : c; }); m_modFormat.formatName = MPT_UFORMAT("ProTracker MOD ({})")(mpt::ToUnicode(mpt::Charset::ASCII, std::string(std::begin(magic), std::end(magic)))); - m_modFormat.type = U_("mod"); + m_modFormat.type = UL_("mod"); if(modMagicResult.madeWithTracker) m_modFormat.madeWithTracker = modMagicResult.madeWithTracker; m_modFormat.charset = mpt::Charset::Amiga_no_C1; if(anyADPCM) - m_modFormat.madeWithTracker += U_(" (ADPCM packed)"); + m_modFormat.madeWithTracker += UL_(" (ADPCM packed)"); return true; } Modified: trunk/OpenMPT/soundlib/Load_mt2.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mt2.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mt2.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -450,7 +450,7 @@ InitializeGlobals(MOD_TYPE_MT2, fileHeader.numChannels); m_modFormat.formatName = MPT_UFORMAT("MadTracker {}.{}")(fileHeader.version >> 8, mpt::ufmt::hex0<2>(fileHeader.version & 0xFF)); - m_modFormat.type = U_("mt2"); + m_modFormat.type = UL_("mt2"); m_modFormat.madeWithTracker = mpt::ToUnicode(mpt::Charset::Windows1252, mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.trackerName)); m_modFormat.charset = mpt::Charset::Windows1252; Modified: trunk/OpenMPT/soundlib/Load_mtm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mtm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mtm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -139,8 +139,8 @@ m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songName); m_nSamples = fileHeader.numSamples; - m_modFormat.formatName = U_("MultiTracker"); - m_modFormat.type = U_("mtm"); + m_modFormat.formatName = UL_("MultiTracker"); + m_modFormat.type = UL_("mtm"); m_modFormat.madeWithTracker = MPT_UFORMAT("MultiTracker {}.{}")(fileHeader.version >> 4, fileHeader.version & 0x0F); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_mus_km.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mus_km.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_mus_km.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -373,8 +373,8 @@ Order.SetSequence(0); - m_modFormat.formatName = U_("Karl Morton Music Format"); - m_modFormat.type = U_("mus"); + m_modFormat.formatName = UL_("Karl Morton Music Format"); + m_modFormat.type = UL_("mus"); m_modFormat.charset = mpt::Charset::CP437; return true; Modified: trunk/OpenMPT/soundlib/Load_okt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_okt.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_okt.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -348,8 +348,8 @@ InitializeGlobals(MOD_TYPE_OKT, 0); - m_modFormat.formatName = U_("Oktalyzer"); - m_modFormat.type = U_("okt"); + m_modFormat.formatName = UL_("Oktalyzer"); + m_modFormat.type = UL_("okt"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; // Go through IFF chunks... Modified: trunk/OpenMPT/soundlib/Load_plm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_plm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_plm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -149,8 +149,8 @@ m_SongFlags = SONG_ITOLDEFFECTS; m_playBehaviour.set(kApplyOffsetWithoutNote); - m_modFormat.formatName = U_("Disorder Tracker 2"); - m_modFormat.type = U_("plm"); + m_modFormat.formatName = UL_("Disorder Tracker 2"); + m_modFormat.type = UL_("plm"); m_modFormat.charset = mpt::Charset::CP437; // Some PLMs use ASCIIZ, some space-padding strings...weird. Oh, and the file browser stops at 0 bytes in the name, the main GUI doesn't. Modified: trunk/OpenMPT/soundlib/Load_psm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_psm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_psm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -590,8 +590,8 @@ ChnSettings[chn].dwFlags.set(CHN_SURROUND, subsongs[0].channelSurround[chn]); } - m_modFormat.formatName = sinariaFormat ? U_("Epic MegaGames MASI (New Version / Sinaria)") : U_("Epic MegaGames MASI (New Version)"); - m_modFormat.type = U_("psm"); + m_modFormat.formatName = sinariaFormat ? UL_("Epic MegaGames MASI (New Version / Sinaria)") : UL_("Epic MegaGames MASI (New Version)"); + m_modFormat.type = UL_("psm"); m_modFormat.charset = mpt::Charset::CP437; if(!(loadFlags & loadPatternData)) @@ -1046,8 +1046,8 @@ // Seems to be valid! InitializeGlobals(MOD_TYPE_PSM, Clamp(CHANNELINDEX(fileHeader.numChannelsPlay), CHANNELINDEX(fileHeader.numChannelsReal), MAX_BASECHANNELS)); - m_modFormat.formatName = U_("Epic MegaGames MASI (Old Version)"); - m_modFormat.type = U_("psm"); + m_modFormat.formatName = UL_("Epic MegaGames MASI (Old Version)"); + m_modFormat.type = UL_("psm"); m_modFormat.charset = mpt::Charset::CP437; m_nSamplePreAmp = fileHeader.masterVolume; Modified: trunk/OpenMPT/soundlib/Load_pt36.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_pt36.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_pt36.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -154,7 +154,7 @@ if(version.empty()) { - version = U_("3.6"); + version = UL_("3.6"); } // both an info chunk and a module are required @@ -202,7 +202,7 @@ } } - m_modFormat.madeWithTracker = U_("ProTracker ") + version; + m_modFormat.madeWithTracker = UL_("ProTracker ") + version; } m_SongFlags.set(SONG_PT_MODE); m_playBehaviour.set(kMODIgnorePanning); Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ptm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_ptm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -170,8 +170,8 @@ m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songname); - m_modFormat.formatName = U_("PolyTracker"); - m_modFormat.type = U_("ptm"); + m_modFormat.formatName = UL_("PolyTracker"); + m_modFormat.type = UL_("ptm"); m_modFormat.madeWithTracker = MPT_UFORMAT("PolyTracker {}.{}")(fileHeader.versionHi.get(), mpt::ufmt::hex0<2>(fileHeader.versionLo.get())); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_rtm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_rtm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_rtm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -337,7 +337,7 @@ } m_modFormat.formatName = MPT_UFORMAT("Real Tracker {}.{}")(fileHeader.version >> 8, mpt::ufmt::hex0<2>(fileHeader.version & 0xFF)); - m_modFormat.type = U_("rtm"); + m_modFormat.type = UL_("rtm"); m_modFormat.madeWithTracker = mpt::ToUnicode(mpt::Charset::CP437, mpt::String::ReadBuf(mpt::String::maybeNullTerminated, songHeader.software)); m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_sfx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_sfx.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_sfx.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -444,7 +444,7 @@ } } - m_modFormat.formatName = m_nSamples == 15 ? MPT_UFORMAT("SoundFX 1.{}")(version) : U_("SoundFX 2.0 / MultiMedia Sound"); + m_modFormat.formatName = m_nSamples == 15 ? MPT_UFORMAT("SoundFX 1.{}")(version) : UL_("SoundFX 2.0 / MultiMedia Sound"); m_modFormat.type = m_nSamples == 15 ? UL_("sfx") : UL_("sfx2"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; Modified: trunk/OpenMPT/soundlib/Load_stk.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_stk.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_stk.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -462,8 +462,8 @@ break; } - m_modFormat.formatName = U_("Soundtracker"); - m_modFormat.type = U_("stk"); + m_modFormat.formatName = UL_("Soundtracker"); + m_modFormat.type = UL_("stk"); m_modFormat.madeWithTracker = madeWithTracker; m_modFormat.charset = mpt::Charset::Amiga_no_C1; Modified: trunk/OpenMPT/soundlib/Load_stm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_stm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_stm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -233,8 +233,8 @@ m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songname); - m_modFormat.formatName = U_("Scream Tracker 2"); - m_modFormat.type = U_("stm"); + m_modFormat.formatName = UL_("Scream Tracker 2"); + m_modFormat.type = UL_("stm"); m_modFormat.madeWithTracker = MPT_UFORMAT("Scream Tracker {}.{}")(fileHeader.verMajor, mpt::ufmt::dec0<2>(fileHeader.verMinor)); m_modFormat.charset = mpt::Charset::CP437; @@ -588,8 +588,8 @@ } } - m_modFormat.formatName = U_("Scream Tracker Music Interface Kit"); - m_modFormat.type = U_("stx"); + m_modFormat.formatName = UL_("Scream Tracker Music Interface Kit"); + m_modFormat.type = UL_("stx"); m_modFormat.charset = mpt::Charset::CP437; m_modFormat.madeWithTracker = MPT_UFORMAT("STM2STX 1.{}")(formatVersion); Modified: trunk/OpenMPT/soundlib/Load_stp.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_stp.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_stp.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -257,7 +257,7 @@ InitializeGlobals(MOD_TYPE_STP, 4); m_modFormat.formatName = MPT_UFORMAT("Soundtracker Pro II v{}")(fileHeader.version); - m_modFormat.type = U_("stp"); + m_modFormat.type = UL_("stp"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; m_nSamples = 0; Modified: trunk/OpenMPT/soundlib/Load_symmod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_symmod.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_symmod.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -1902,14 +1902,14 @@ ChnSettings[chn].nMixPlugin = useDSP ? 1 : 0; // For MIDI macros controlling the echo DSP } - m_modFormat.formatName = U_("Symphonie"); - m_modFormat.type = U_("symmod"); + m_modFormat.formatName = UL_("Symphonie"); + m_modFormat.type = UL_("symmod"); if(!isSymphoniePro) - m_modFormat.madeWithTracker = U_("Symphonie"); // or Symphonie Jr + m_modFormat.madeWithTracker = UL_("Symphonie"); // or Symphonie Jr else if(instruments.size() <= 128) - m_modFormat.madeWithTracker = U_("Symphonie Pro"); + m_modFormat.madeWithTracker = UL_("Symphonie Pro"); else - m_modFormat.madeWithTracker = U_("Symphonie Pro 256"); + m_modFormat.madeWithTracker = UL_("Symphonie Pro 256"); m_modFormat.charset = mpt::Charset::Amiga_no_C1; return true; Modified: trunk/OpenMPT/soundlib/Load_uax.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_uax.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_uax.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -44,7 +44,7 @@ InitializeGlobals(MOD_TYPE_MPT, 4); m_modFormat.formatName = MPT_UFORMAT("Unreal Package v{}")(fileHeader.packageVersion); - m_modFormat.type = U_("uax"); + m_modFormat.type = UL_("uax"); m_modFormat.charset = mpt::Charset::Windows1252; // Read export table Modified: trunk/OpenMPT/soundlib/Load_ult.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ult.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_ult.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -307,8 +307,8 @@ m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, fileHeader.songName); const mpt::uchar *versions[] = {UL_("<1.4"), UL_("1.4"), UL_("1.5"), UL_("1.6")}; - m_modFormat.formatName = U_("UltraTracker"); - m_modFormat.type = U_("ult"); + m_modFormat.formatName = UL_("UltraTracker"); + m_modFormat.type = UL_("ult"); m_modFormat.madeWithTracker = U_("UltraTracker ") + versions[fileHeader.version - '1']; m_modFormat.charset = mpt::Charset::CP437; Modified: trunk/OpenMPT/soundlib/Load_wav.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_wav.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_wav.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -87,8 +87,8 @@ return false; } - m_modFormat.formatName = U_("RIFF WAVE"); - m_modFormat.type = U_("wav"); + m_modFormat.formatName = UL_("RIFF WAVE"); + m_modFormat.type = UL_("wav"); m_modFormat.charset = mpt::Charset::Windows1252; const SmpLength sampleLength = wavFile.GetSampleLength(); Modified: trunk/OpenMPT/soundlib/Load_xm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_xm.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/Load_xm.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -754,12 +754,12 @@ { // ModPlug Tracker Alpha m_dwLastSavedWithVersion = MPT_V("1.00.00.A5"); - madeWithTracker = U_("ModPlug Tracker 1.0 alpha"); + madeWithTracker = UL_("ModPlug Tracker 1.0 alpha"); } else if(instrHeader.size == 263) { // ModPlug Tracker Beta (Beta 1 still behaves like Alpha, but Beta 3.3 does it this way) m_dwLastSavedWithVersion = MPT_V("1.00.00.B3"); - madeWithTracker = U_("ModPlug Tracker 1.0 beta"); + madeWithTracker = UL_("ModPlug Tracker 1.0 beta"); } else { // WTF? @@ -1010,18 +1010,18 @@ if(madeWith[verModPlugBidiFlag]) { m_dwLastSavedWithVersion = MPT_V("1.11"); - madeWithTracker = U_("ModPlug Tracker 1.0 - 1.11"); + madeWithTracker = UL_("ModPlug Tracker 1.0 - 1.11"); } else if(madeWith[verNewModPlug] && !madeWith[verPlayerPRO]) { m_dwLastSavedWithVersion = MPT_V("1.16"); - madeWithTracker = U_("ModPlug Tracker 1.0 - 1.16"); + madeWithTracker = UL_("ModPlug Tracker 1.0 - 1.16"); } else if(madeWith[verNewModPlug] && madeWith[verPlayerPRO]) { m_dwLastSavedWithVersion = MPT_V("1.16"); - madeWithTracker = U_("ModPlug Tracker 1.0 - 1.16 / PlayerPRO"); + madeWithTracker = UL_("ModPlug Tracker 1.0 - 1.16 / PlayerPRO"); } else if(!madeWith[verNewModPlug] && madeWith[verPlayerPRO]) { - madeWithTracker = U_("PlayerPRO"); + madeWithTracker = UL_("PlayerPRO"); } } @@ -1070,13 +1070,13 @@ { if(madeWith[verDigiTrakker] && sampleReserved == 0 && (lastInstrType ? lastInstrType : -1) == -1) { - madeWithTracker = U_("DigiTrakker"); + madeWithTracker = UL_("DigiTrakker"); } else if(madeWith[verFT2Generic]) { - madeWithTracker = U_("FastTracker 2 or compatible"); + madeWithTracker = UL_("FastTracker 2 or compatible"); } else { - madeWithTracker = U_("Unknown"); + madeWithTracker = UL_("Unknown"); } } @@ -1097,7 +1097,7 @@ if(m_dwLastSavedWithVersion >= MPT_V("1.17")) { - madeWithTracker = U_("OpenMPT ") + m_dwLastSavedWithVersion.ToUString(); + madeWithTracker = UL_("OpenMPT ") + m_dwLastSavedWithVersion.ToUString(); } // We no longer allow any --- or +++ items in the order list now. @@ -1115,16 +1115,16 @@ if(isOXM) { m_modFormat.originalFormatName = std::move(m_modFormat.formatName); - m_modFormat.formatName = U_("OggMod FastTracker 2"); - m_modFormat.type = U_("oxm"); - m_modFormat.originalType = U_("xm"); + m_modFormat.formatName = UL_("OggMod FastTracker 2"); + m_modFormat.type = UL_("oxm"); + m_modFormat.originalType = UL_("xm"); } else { - m_modFormat.type = U_("xm"); + m_modFormat.type = UL_("xm"); } if(anyADPCM) - m_modFormat.madeWithTracker += U_(" (ADPCM packed)"); + m_modFormat.madeWithTracker += UL_(" (ADPCM packed)"); return true; } Modified: trunk/OpenMPT/soundlib/load_j2b.cpp ============================================================================== --- trunk/OpenMPT/soundlib/load_j2b.cpp Sat Jul 13 21:48:42 2024 (r21157) +++ trunk/OpenMPT/soundlib/load_j2b.cpp Sun Jul 14 01:44:35 2024 (r21158) @@ -747,7 +747,7 @@ m_nDefaultGlobalVolume = mainChunk.globalvolume * 2; m_modFormat.formatName = isAM ? UL_("Galaxy Sound System (new version)") : UL_("Galaxy Sound System (old version)"); - m_modFormat.type = U_("j2b"); + m_modFormat.type = UL_("j2b"); m_modFormat.charset = mpt::Charset::CP437; m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, mainChunk.songname); |
