modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r22405 - in branches/OpenMPT-1.31: doc/libopenmpt libopenmpt

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

Author: manx
Date: Sun Dec  1 14:10:13 2024
New Revision: 22405
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22405

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 13:32:54 2024	(r22404)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 14:10:13 2024	(r22405)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.7.12-pre
+### libopenmpt 0.7.12 (2024-12-01)
 
  *  [**Bug**] Fixed various undefined behaviour found with ubsan.
 

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Dec  1 13:32:54 2024	(r22404)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.h	Sun Dec  1 14:10:13 2024	(r22405)
@@ -23,9 +23,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 12
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Dec  1 13:32:54 2024	(r22404)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_version.mk	Sun Dec  1 14:10:13 2024	(r22405)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=7
 LIBOPENMPT_VERSION_PATCH=12
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=4
 LIBOPENMPT_LTVER_REVISION=12

[OMPT-svn-commit] OpenMPT r22404 - tags/1.31.13.00

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

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

Log:
Created tag for OpenMPT 1.31.13.00

Added:
   tags/1.31.13.00/
      - copied from r22403, branches/OpenMPT-1.31/

[OMPT-svn-commit] OpenMPT r22403 - in branches/OpenMPT-1.31: common packageTemplate

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

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

Log:
[Doc] Update release notes.
[Mod] OpenMPT: Version is now 1.31.13.00

Modified:
   branches/OpenMPT-1.31/common/versionNumber.h
   branches/OpenMPT-1.31/packageTemplate/History.txt

Modified: branches/OpenMPT-1.31/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.31/common/versionNumber.h	Sun Dec  1 13:15:41 2024	(r22402)
+++ branches/OpenMPT-1.31/common/versionNumber.h	Sun Dec  1 13:32:08 2024	(r22403)
@@ -17,7 +17,7 @@
 // Version definitions. The only thing that needs to be changed when changing version number.
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
-#define VER_MINOR      12
-#define VER_MINORMINOR 02
+#define VER_MINOR      13
+#define VER_MINORMINOR 00
 
 OPENMPT_NAMESPACE_END

Modified: branches/OpenMPT-1.31/packageTemplate/History.txt
==============================================================================
--- branches/OpenMPT-1.31/packageTemplate/History.txt	Sun Dec  1 13:15:41 2024	(r22402)
+++ branches/OpenMPT-1.31/packageTemplate/History.txt	Sun Dec  1 13:32:08 2024	(r22403)
@@ -27,12 +27,77 @@
    <jb>    JoaoBaptMG / João Baptista de Paula e Silva
    <kk>    SYRiNX     / Keith F. Kelly
    <ks>    coda       / Ken Snyder
+   <ze>    zersal
 
 
 Got questions, comments or bug reports? Visit https://openmpt.org/ where you can
 find our issue tracker and forums.
 
 
+v1.31.13.00 (1 December 2024, revision 22403)
+---------------------------------------------
+Tree view
+- [Imp] <js> Add option to open modules and instrument library entries in Explorer through the context menu (http://bugs.openmpt.org/view.php?id=677).
+- [Fix] <js> The folder browser could not handle paths longer than 260 characters.
+
+Pattern tab
+- [Fix] <js> Special note keys (Note Cut / Off / Fade / PC / PCs) were not available in the default key map on various keyboard layouts (http://bugs.openmpt.org/view.php?id=1838).
+- [Fix] <js> When partially pasting a normal pattern event over a PC event, the effect column was not erased properly if it wasn't part of the copied region.
+- [Fix] <js> When evaluating MIDI macros containing letters "u" or "v" during seeking, the initial global volume was applied to them, rather than the global volume that would be reached at that pattern position.
+
+Instrument tab
+- [Imp] <js> When moving the last envelope point, avoid it snapping back quickly when moving backwards (http://bugs.openmpt.org/view.php?id=297).
+- [Imp] <js> Show tooltips for disabled envelope toolbar buttons, and show the button name in the toolbar.
+- [Fix] <js> When importing a soundfont instrument, its bank number was off by one (http://bugs.openmpt.org/view.php?id=1842).
+
+Mod Conversion
+- [Imp] <js> Improve handling of the transpose = -1 / finetune = 0 case when converting samples from another format to MOD. This combination is now automatically translated to finetune = -8.
+
+IT
+- [Imp] <js> Don't report files claiming to be made with Impulse Tracker 2.08+ as IT-made if they have no edit timer.
+- [Fix] <js> Ignore sample data in slots that don't have the "sample data present" flag set, if the file vaguely looks IT-made to avoid playing garbage caused by an Impulse Tracker bug that should not be audible (http://www.un4seen.com/forum/?topic=20542.0).
+
+S3M
+- [Imp] <js> Detect early Schism Tracker versions.
+
+MOD
+- [Imp] <js> When trying to detect MOD files with broken order lists, the file size is now rounded down to an even number. This helps identifying some malformed files (MOD files can technically not have an odd size).
+- [Fix] <js> Also enable ProTracker-compatible tremolo ramp waveform for M!K! modules.
+- [Fix] <js> In ProTracker 1/2 mode, retrigger with instrument-less notes now keeps using the previous sample offset.
+
+Other formats
+- [Imp] <js> Warn when Startrekker AM companion file for synthesized instruments is most likely missing.
+- [Imp] DBM / IMF / MED: When merging pattern commands, allow to move offset to volume column at the expense of a lower offset resolution. Slightly improves playback of ShowMeLove.med (http://www.un4seen.com/forum/?topic=15448.msg144136#msg144136).
+- [Fix] <js> MED: Fix correct octave transposition in some MED files that have hardware mixing disabled but sample transpose enabled. Fixed Journey.med (http://www.un4seen.com/forum/?topic=15448.msg143713#msg143713).
+- [Fix] <js> MED: Don't enable Amiga resampler if any stereo samples are found, as it does not support stereo samples (http://www.un4seen.com/forum/?topic=15448.msg144058#msg144058).
+- [Fix] <js> MED: Fix tempo in some files using software mixing mode and legacy tempo values (http://www.un4seen.com/forum/?topic=15448.msg144080#msg144080).
+- [Fix] <js> MED: Avoid importing effect memory for some commands (http://www.un4seen.com/forum/?topic=15448.msg144131#msg144131).
+- [Fix] <js> MED: Retrigger with instrument-less note now keeps using the previous sample offset. Fixes Kris Hadalot.med (http://www.un4seen.com/forum/?topic=15448.msg144130#msg144130).
+- [Fix] <js> MED: Disable sample swapping on notes with portamento, and don't resume stopped notes with portamento. Fixes Homeward_Trek.med by Soundburst (http://www.un4seen.com/forum/?topic=15448.msg144148#msg144148).
+- [Fix] <js> MED: Only use 7-bit volume commands in MMD3 files made with a new enough version of MED Soundstudio.
+- [Fix] <js> STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next sample's data when loops exceed the sample length (http://www.un4seen.com/forum/?topic=15448.msg144130#msg144130).
+
+Module cleanup
+- [Fix] <js> Possible crash when searching for unused samples if an instrument refers to a non-existing sample slot.
+
+Misc
+- [Imp] <js> Added the possibility to disable enhanced GDI upscaling via hidden setting "Display.UseGDIUpcaling". This may fix freezes when opening the editors of some older VST plugins when this mode is enabled (http://bugs.openmpt.org/view.php?id=1524).
+- [Imp] <js> Channel Manager: Channel buttons now have tooltips.
+- [Mod] <js> When enabling the "Display.HighResUI" option, OpenMPT claimed to support per-monitor awareness. This was not really usable, so OpenMPT now only claims to support one system-wide DPI setting. 
+- [Mod] <js> Auto save no longer uses relative paths for external samples when auto saving to a user-specified folder.
+- [Fix] <js> MIDI recording: Velocity amplification was rounded down to integer multiples of 100% (http://bugs.openmpt.org/view.php?id=1835).
+- [Fix] <js> After loading a module with missing external samples, OpenMPT still prompted to save those empty sample slots to disk when closing the module. Doing that resulted in a crash.
+- [Fix] <js> Fix truncated display of first item in checkbox lists in particular "Display.HighResUI" enabled. Potentially also fixes http://bugs.openmpt.org/view.php?id=1480
+- [Fix] <js> When changing a shortcut via a search that had results in multiple contexts, a wrong context could be assigned to the shortcut.
+- [Fix] <js> File/Append shortcut didn't work.
+- [Fix] <js> Cleaning up auto save files, scanning for missing samples or creating the list of templates or example songs in paths longer than 260 characters did not work.
+- [Fix] <ze> When saving a copy of a module, its modified status is no longer reset (http://bugs.openmpt.org/view.php?id=1843).
+- [Fix] <js> On Windows XP, the advanced settings list was not formatted correctly.
+
+Third-Party Libraries
+- [Imp] Update mpg123 (v1.32.9)
+
+
 v1.31.12.00 (26 October 2024, revision 21983)
 ---------------------------------------------
 Pattern tab

[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

[OMPT-svn-commit] OpenMPT r22401 - branches/OpenMPT-1.29/soundlib

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

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

Log:
[Fix] Fix compilation.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_mod.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 13:14:48 2024	(r22400)
+++ branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 13:15:19 2024	(r22401)
@@ -1307,13 +1307,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

[OMPT-svn-commit] OpenMPT r22400 - branches/OpenMPT-1.30/soundlib

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

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

Log:
[Fix] Fix compilation.

Modified:
   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 13:09:20 2024	(r22399)
+++ branches/OpenMPT-1.30/soundlib/Load_mod.cpp	Sun Dec  1 13:14:48 2024	(r22400)
@@ -1314,13 +1314,7 @@
 				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);
-					}
-					AddToLog(LogWarning, MPT_UFORMAT("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

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

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

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

Log:
Merged revision(s) 22398 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:08:43 2024	(r22398)
+++ branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 13:09:20 2024	(r22399)
@@ -1249,9 +1249,9 @@
 				{
 #ifdef MPT_EXTERNAL_SAMPLES
 					mpt::ustring filenameHint;
-					if(file.GetOptionalFileName())
+					if(!file.GetFileName().empty())
 					{
-						const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode();
+						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));

[OMPT-svn-commit] OpenMPT r22398 - branches/OpenMPT-1.29/soundlib

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

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

Log:
[Fix] Fix compilation.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_mod.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 13:01:53 2024	(r22397)
+++ branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 13:08:43 2024	(r22398)
@@ -1308,9 +1308,9 @@
 				{
 #ifdef MPT_EXTERNAL_SAMPLES
 					mpt::ustring filenameHint;
-					if(file.GetOptionalFileName())
+					if(!file.GetFileName().empty())
 					{
-						const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode();
+						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));

[OMPT-svn-commit] OpenMPT r22397 - branches/OpenMPT-1.28/libopenmpt/dox

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Dec  1 13:00:50 2024	(r22396)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Dec  1 13:01:53 2024	(r22397)
@@ -9,6 +9,11 @@
 
  *  [**Bug**] Fixed various undefined behaviour found with ubsan.
 
+ *  Warn when a Startrekker AM file most likely requires an (currently
+    unsupported) external instrument definition file. 
+ *  STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next
+    sample's data when loops exceed the sample length.
+
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.4.46 (2024-10-26)

[OMPT-svn-commit] OpenMPT r22396 - branches/OpenMPT-1.29/libopenmpt/dox

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Dec  1 12:57:22 2024	(r22395)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Dec  1 13:00:50 2024	(r22396)
@@ -9,6 +9,15 @@
 
  *  [**Bug**] Fixed various undefined behaviour found with ubsan.
 
+ *  Warn when a Startrekker AM file most likely requires an (currently
+    unsupported) external instrument definition file. 
+ *  MED: Don't enable Amiga resampler if any stereo samples are found, as it
+    does not support stereo samples.
+ *  MED: Disable sample swapping on notes with portamento, and don't resume
+    stopped notes with portamento.
+ *  STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next
+    sample's data when loops exceed the sample length.
+
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.5.34 (2024-10-26)

[OMPT-svn-commit] OpenMPT r22395 - branches/OpenMPT-1.30/libopenmpt/dox

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Dec  1 12:56:55 2024	(r22394)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Sun Dec  1 12:57:22 2024	(r22395)
@@ -9,6 +9,27 @@
 
  *  [**Bug**] Fixed various undefined behaviour found with ubsan.
 
+ *  IT: Ignore sample data in slots that don't have the "sample data present"
+    flag set, if the file vaguely looks IT-made to avoid playing garbage caused
+    by an Impulse Tracker bug that should not be audible.
+ *  MOD: Also enable ProTracker-compatible tremolo ramp waveform for
+    M!K! modules.
+ *  MOD: In ProTracker 1/2 mode, retrigger with instrument-less notes now keeps
+    using the previous sample offset.
+ *  Warn when a Startrekker AM file most likely requires an (currently
+    unsupported) external instrument definition file. 
+ *  MED: Don't enable Amiga resampler if any stereo samples are found, as it
+    does not support stereo samples.
+ *  MED: Retrigger with instrument-less note now keeps using the previous sample
+    offset.
+ *  MED: Disable sample swapping on notes with portamento, and don't resume
+    stopped notes with portamento.
+ *  STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next
+    sample's data when loops exceed the sample length.
+ *  When evaluating MIDI macros containing letters "u" or "v" during seeking,
+    the initial global volume was applied to them, rather than the global volume
+    that would be reached at that pattern position.
+
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.6.20 (2024-10-26)

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

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

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

Log:
Merged revision(s) 22170 from trunk/OpenMPT:
[Fix] IT: Ignore sample data in slots that don't have the "sample data present" flag set, if the file vaguely looks IT-made. There's a bug in IT that sometimes doesn't reset the sample length after deleting a sample (presumably). For most files this does not make an audible difference, because such sample slots are typically unused, or the sample offset pointer points at the end of the file anyway. However, a small handful of files references these deleted samples in pattern data, so a lot of unwanted noise can be heard. See https://www.un4seen.com/forum/?topic=20542.0 for reference.
........

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

Modified: branches/OpenMPT-1.30/soundlib/ITTools.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/ITTools.cpp	Sun Dec  1 12:55:42 2024	(r22393)
+++ branches/OpenMPT-1.30/soundlib/ITTools.cpp	Sun Dec  1 12:56:55 2024	(r22394)
@@ -530,10 +530,9 @@
 // Convert an ITSample to OpenMPT's internal sample representation.
 uint32 ITSample::ConvertToMPT(ModSample &mptSmp) const
 {
-	if(memcmp(id, "IMPS", 4))
-	{
-		return 0;
-	}
+	// IT does not check for the IMPS magic, and some bad XM->IT converter out there doesn't write the magic bytes for empty sample slots.
+	//if(memcmp(id, "IMPS", 4))
+	//	return 0;
 
 	mptSmp.Initialize(MOD_TYPE_IT);
 	mptSmp.SetDefaultCuePoints();  // For old IT/MPTM files

Modified: branches/OpenMPT-1.30/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_it.cpp	Sun Dec  1 12:55:42 2024	(r22393)
+++ branches/OpenMPT-1.30/soundlib/Load_it.cpp	Sun Dec  1 12:56:55 2024	(r22394)
@@ -767,6 +767,19 @@
 
 	bool possibleXMconversion = false;
 
+	// There's a bug in IT somewhere that resets the "sample data present" flag in sample headers, but keeps the sample length
+	// of a previously deleted sample (presumably).
+	// As old ModPlug versions didn't set this flag under some circumstances (if a sample wasn't referenced by any instruments in instrument mode),
+	// and because there appear to be some external tools that forget to set this flag at all, we only respect the flag if the file
+	// vaguely looks like it was saved with IT. Some files that play garbage data if we don't do this:
+	// astral projection.it by Lord Jon Ray
+	// classic illusions.it by Blackstar
+	// deep in dance.it by Simply DJ
+	// There are many more such files but they don't reference the broken samples in their pattern data, or the sample data pointer
+	// points right to the end of the file, so in both cases no audible problem can be observed.
+	const bool muteBuggySamples = !interpretModPlugMade && fileHeader.cwtv >= 0x0100 && fileHeader.cwtv <= 0x0217
+		&& (fileHeader.cwtv < 0x0207 || fileHeader.reserved != 0);
+
 	// Reading Samples
 	m_nSamples = std::min(static_cast<SAMPLEINDEX>(fileHeader.smpnum), static_cast<SAMPLEINDEX>(MAX_SAMPLES - 1));
 	bool lastSampleCompressed = false;
@@ -775,9 +788,10 @@
 		ITSample sampleHeader;
 		if(smpPos[i] > 0 && file.Seek(smpPos[i]) && file.ReadStruct(sampleHeader))
 		{
-			// IT does not check for the IMPS magic, and some bad XM->IT converter out there doesn't write the magic bytes for empty sample slots.
 			ModSample &sample = Samples[i + 1];
 			size_t sampleOffset = sampleHeader.ConvertToMPT(sample);
+			if(muteBuggySamples && !(sampleHeader.flags & ITSample::sampleDataPresent))
+				sample.nLength = 0;
 
 			m_szNames[i + 1] = mpt::String::ReadBuf(mpt::String::spacePadded, sampleHeader.name);
 

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

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

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

Log:
Merged revision(s) 22055 from trunk/OpenMPT:
[Fix] MOD: Also enable ProTracker-compatible tremolo ramp waveform for M!K! modules.
........

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:54:35 2024	(r22392)
+++ branches/OpenMPT-1.30/soundlib/Load_mod.cpp	Sun Dec  1 12:55:42 2024	(r22393)
@@ -1187,7 +1187,7 @@
 	{
 		m_SongFlags.set(SONG_ISAMIGA);
 	}
-	if(isGenericMultiChannel || isMdKd)
+	if(isGenericMultiChannel || isMdKd || IsMagic(magic, "M!K!"))
 	{
 		m_playBehaviour.set(kFT2MODTremoloRampWaveform);
 	}

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

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

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

Log:
Merged revision(s) 22218 from trunk/OpenMPT:
[Fix] MOD: In PT mode, retriggered notes should keep using the 9xx offset.
[Fix] MED: OctaMED also uses the previous offset for retriggered notes (like MOD), but doesn't have the ProTracker offset adding bug (so more like S3M). Fixes Kris Hadalot.med (https://www.un4seen.com/forum/?topic=15448.msg144130#msg144130).
........

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

Modified: branches/OpenMPT-1.30/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Dec  1 12:49:58 2024	(r22391)
+++ branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Dec  1 12:54:35 2024	(r22392)
@@ -1195,6 +1195,7 @@
 		m_SongFlags.set(SONG_FASTVOLSLIDES, !(songHeader.flags & MMDSong::FLAG_STSLIDE));
 		m_playBehaviour.set(kST3PortaSampleChange);
 		m_playBehaviour.set(kFT2PortaNoNote);
+		m_playBehaviour.set(kST3OffsetWithoutInstrument);
 
 		if(expData.songNameOffset && file.Seek(expData.songNameOffset))
 		{

Modified: branches/OpenMPT-1.30/soundlib/Snd_fx.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Snd_fx.cpp	Sun Dec  1 12:49:58 2024	(r22391)
+++ branches/OpenMPT-1.30/soundlib/Snd_fx.cpp	Sun Dec  1 12:54:35 2024	(r22392)
@@ -1883,7 +1883,7 @@
 			chn.nLoopEnd = pSmp->nLength;
 			chn.nLoopStart = 0;
 			chn.position.Set(0);
-			if((m_SongFlags[SONG_PT_MODE] || m_playBehaviour[kST3OffsetWithoutInstrument]) && !chn.rowCommand.instr)
+			if((m_SongFlags[SONG_PT_MODE] || m_playBehaviour[kST3OffsetWithoutInstrument] || GetType() == MOD_TYPE_MED) && !chn.rowCommand.instr)
 			{
 				chn.position.SetInt(std::min(chn.prevNoteOffset, chn.nLength - SmpLength(1)));
 			} else
@@ -5297,7 +5297,7 @@
 {
 	// ST3 compatibility: Instrument-less note recalls previous note's offset
 	// Test case: OxxMemory.s3m
-	if(m_playBehaviour[kST3OffsetWithoutInstrument])
+	if(m_playBehaviour[kST3OffsetWithoutInstrument] || GetType() == MOD_TYPE_MED)
 		chn.prevNoteOffset = 0;
 	
 	chn.prevNoteOffset += param;
@@ -5568,7 +5568,10 @@
 
 		const bool fading = chn.dwFlags[CHN_NOTEFADE];
 		const auto oldPrevNoteOffset = chn.prevNoteOffset;
-		chn.prevNoteOffset = 0;  // Retriggered notes should not use previous offset (test case: OxxMemoryWithRetrig.s3m)
+		// Retriggered notes should not use previous offset in S3M
+		// Test cases: OxxMemoryWithRetrig.s3m, PTOffsetRetrigger.mod
+		if(GetType() == MOD_TYPE_S3M)
+			chn.prevNoteOffset = 0;
 		// IT compatibility: Really weird combination of envelopes and retrigger (see Storlek's q.it testcase)
 		// Test cases: retrig.it, RetrigSlide.s3m
 		const bool itS3Mstyle = m_playBehaviour[kITRetrigger] || (GetType() == MOD_TYPE_S3M && chn.nLength && !oplRealRetrig);

[OMPT-svn-commit] OpenMPT r22391 - branches/OpenMPT-1.31/doc/libopenmpt

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:49:26 2024	(r22390)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:49:58 2024	(r22391)
@@ -43,7 +43,7 @@
     sample's data when loops exceed the sample length.
  *  When evaluating MIDI macros containing letters "u" or "v" during seeking,
     the initial global volume was applied to them, rather than the global volume
-	that would be reached at that pattern position.
+    that would be reached at that pattern position.
 
  *  mpg123: Update to v1.32.9 (2024-11-02).
 

[OMPT-svn-commit] OpenMPT r22390 - branches/OpenMPT-1.31/doc/libopenmpt

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:49:06 2024	(r22389)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:49:26 2024	(r22390)
@@ -44,6 +44,7 @@
  *  When evaluating MIDI macros containing letters "u" or "v" during seeking,
     the initial global volume was applied to them, rather than the global volume
 	that would be reached at that pattern position.
+
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.7.11 (2024-10-26)

[OMPT-svn-commit] OpenMPT r22389 - branches/OpenMPT-1.31/doc/libopenmpt

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:46:50 2024	(r22388)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:49:06 2024	(r22389)
@@ -41,7 +41,9 @@
     version of MED Soundstudio.
  *  STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next
     sample's data when loops exceed the sample length.
-
+ *  When evaluating MIDI macros containing letters "u" or "v" during seeking,
+    the initial global volume was applied to them, rather than the global volume
+	that would be reached at that pattern position.
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.7.11 (2024-10-26)

[OMPT-svn-commit] OpenMPT r22388 - branches/OpenMPT-1.31/doc/libopenmpt

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

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

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.31/doc/libopenmpt/changelog.md

Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md
==============================================================================
--- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:44:16 2024	(r22387)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Sun Dec  1 12:46:50 2024	(r22388)
@@ -9,6 +9,39 @@
 
  *  [**Bug**] Fixed various undefined behaviour found with ubsan.
 
+ *  IT: Don't report files claiming to be made with Impulse Tracker 2.08+ as
+    IT-made if they have no edit timer.
+ *  IT: Ignore sample data in slots that don't have the "sample data present"
+    flag set, if the file vaguely looks IT-made to avoid playing garbage caused
+    by an Impulse Tracker bug that should not be audible.
+ *  S3M: Detect early Schism Tracker versions.
+ *  MOD: When trying to detect MOD files with broken order lists, the file size
+    is now rounded down to an even number. This helps identifying some malformed
+    files (MOD files can technically not have an odd size).
+ *  MOD: Also enable ProTracker-compatible tremolo ramp waveform for
+    M!K! modules.
+ *  MOD: In ProTracker 1/2 mode, retrigger with instrument-less notes now keeps
+    using the previous sample offset.
+ *  Warn when a Startrekker AM file most likely requires an (currently
+    unsupported) external instrument definition file. 
+ *  DBM / IMF / MED: When merging pattern commands, allow to move offset to
+    volume column at the expense of a lower offset resolution.
+ *  MED: Fix correct octave transposition in some MED files that have hardware
+    mixing disabled but sample transpose enabled.
+ *  MED: Don't enable Amiga resampler if any stereo samples are found, as it
+    does not support stereo samples.
+ *  MED: Fix tempo in some files using oftware mixing mode and legacy tempo
+    values.
+ *  MED: Avoid importing effect memory for some commands.
+ *  MED: Retrigger with instrument-less note now keeps using the previous sample
+    offset.
+ *  MED: Disable sample swapping on notes with portamento, and don't resume
+    stopped notes with portamento.
+ *  MED: Only use 7-bit volume commands in MMD3 files made with a new enough
+    version of MED Soundstudio.
+ *  STM: Do not sanitize sample loop data. Scream Tracker 2 reads into the next
+    sample's data when loops exceed the sample length.
+
  *  mpg123: Update to v1.32.9 (2024-11-02).
 
 ### libopenmpt 0.7.11 (2024-10-26)

[OMPT-svn-commit] OpenMPT r22387 - branches/OpenMPT-1.28/soundlib

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

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

Log:
[Fix] Fix compilation.

Modified:
   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 12:42:49 2024	(r22386)
+++ branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 12:44:16 2024	(r22387)
@@ -1263,7 +1263,6 @@
 			}
 		}
 	}
-#endif // MPT_EXTERNAL_SAMPLES || MPT_BUILD_FUZZER
 
 	// Fix VBlank MODs. Arbitrary threshold: 8 minutes (enough for "frame of mind" by Dascon...).
 	// Basically, this just converts all tempo commands into speed commands

[OMPT-svn-commit] OpenMPT r22386 - branches/OpenMPT-1.29/soundlib

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

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

Log:
[Fix] Fix compilation for tracker build.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_mod.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 12:41:22 2024	(r22385)
+++ branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 12:42:49 2024	(r22386)
@@ -1311,9 +1311,9 @@
 					if(file.GetOptionalFileName())
 					{
 						const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode();
-						filenameHint = MPT_UFORMAT(" ({}.nt or {}.as)")(filename, filename);
+						filenameHint = mpt::format(U_(" ({}.nt or {}.as)"))(filename, filename);
 					}
-					AddToLog(LogWarning, MPT_UFORMAT("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play.")(filenameHint));
+					AddToLog(LogWarning, mpt::format(U_("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."));
 #endif  // MPT_EXTERNAL_SAMPLES

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

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

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

Log:
Merged revision(s) 22056, 22377 from trunk/OpenMPT:
[Imp] Warn when Startrekker AM companion file for synthesized instruments is most likely missing.
........
[Imp] Allow Startrekker AM external sample check to also work for libopenmpt.
........
Merged revision(s) 22377 from trunk/OpenMPT:
[Imp] Allow Startrekker AM external sample check to also work for libopenmpt.
........

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 12:38:07 2024	(r22384)
+++ branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 12:41:22 2024	(r22385)
@@ -984,6 +984,7 @@
 
 	// Reading patterns
 	Patterns.ResizeArray(numPatterns);
+	std::bitset<32> referencedSamples;
 	for(PATTERNINDEX pat = 0; pat < numPatterns; pat++)
 	{
 		ModCommand *rowBase = nullptr;
@@ -1091,6 +1092,8 @@
 				if(m.instr != 0)
 				{
 					lastInstrument[chn] = m.instr;
+					if(isStartrekker)
+						referencedSamples.set(m.instr & 0x1F);
 				}
 			}
 			if(hasSpeedOnRow && hasTempoOnRow) definitelyCIA = true;
@@ -1212,7 +1215,7 @@
 		m_nInstruments = 31;
 #endif
 
-		for(SAMPLEINDEX smp = 1; smp <= m_nInstruments; smp++)
+		for(SAMPLEINDEX smp = 1; smp <= GetNumInstruments(); smp++)
 		{
 			// For Startrekker AM synthesis, we need instrument envelopes.
 			ModInstrument *ins = AllocateInstrument(smp, smp);
@@ -1233,6 +1236,33 @@
 			amData.Skip(120 - sizeof(AMInstrument));
 		}
 	}
+#endif  // MPT_EXTERNAL_SAMPLES || MPT_BUILD_FUZZER
+
+	if((loadFlags & loadSampleData) && isStartrekker && !m_nInstruments)
+	{
+		uint8 emptySampleReferences = 0;
+		for(SAMPLEINDEX smp = 1; smp <= 31; smp++)
+		{
+			if(referencedSamples[smp] && !Samples[smp].nLength)
+			{
+				if(++emptySampleReferences > 1)
+				{
+#ifdef MPT_EXTERNAL_SAMPLES
+					mpt::ustring filenameHint;
+					if(file.GetOptionalFileName())
+					{
+						const auto filename = file.GetOptionalFileName()->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));
+#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
+					break;
+				}
+			}
+		}
+	}
 #endif // MPT_EXTERNAL_SAMPLES || MPT_BUILD_FUZZER
 
 	// Fix VBlank MODs. Arbitrary threshold: 8 minutes (enough for "frame of mind" by Dascon...).

[OMPT-svn-commit] OpenMPT r22384 - in branches/OpenMPT-1.29: . soundlib

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

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

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

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

Modified: branches/OpenMPT-1.29/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 12:37:48 2024	(r22383)
+++ branches/OpenMPT-1.29/soundlib/Load_mod.cpp	Sun Dec  1 12:38:07 2024	(r22384)
@@ -1306,13 +1306,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."));

[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."));

[OMPT-svn-commit] OpenMPT r22382 - in branches/OpenMPT-1.31: . soundlib

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

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."));

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

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

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

Log:
[Ref] Avoid warnings in !MPT_EXTERNAL_SAMPLES mode.

Modified:
   trunk/OpenMPT/soundlib/Load_mod.cpp

Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	Sun Dec  1 12:35:40 2024	(r22380)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	Sun Dec  1 12:37:09 2024	(r22381)
@@ -783,13 +783,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."));