Moved UltraTracker from MikMod to Xmp.

neumatho · Nov 5, 2023 · c72b0a6 · c72b0a6
1 parent a40a83f
commit c72b0a6
Show file tree

Hide file tree

Showing 27 changed files with 2,163 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -24,5 +24,6 @@
 *.sts filter=lfs diff=lfs merge=lfs -text
 *.stx filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
+*.ult filter=lfs diff=lfs merge=lfs -text
 *.xm filter=lfs diff=lfs merge=lfs -text
 *.xpkf filter=lfs diff=lfs merge=lfs -text
diff --git a/Documentation/moduletypes.html b/Documentation/moduletypes.html
@@ -2210,10 +2210,8 @@
 									<p>“UltraTracker” was written by MAS of Prophecy, a.k.a. Marc Andre Schallehn, and released in 1993.</p>
 									<p class="first"><b>File extension</b></p>
 									<p>.ult</p>
-									<p><b>Converter</b></p>
-									<p>MikMod Converter</p>
 									<p><b>Player</b></p>
-									<p>MikMod</p>
+									<p>Xmp</p>
 								</span>
 							</td>
 						</tr>

diff --git a/README.md b/README.md
@@ -180,7 +180,7 @@ Modules in all supported formats can be found on my homepage at https://nostalgi
 | Tracker Packer 3 | .tp3 | ProWizard | ModTracker |
 | Ultimate SoundTracker 1.0 - 1.21 | .mod | | ModTracker |
 | Ultimate SoundTracker 1.8 - 2.0 | .mod | | ModTracker |
-| UltraTracker | .ult | MikMod Converter | MikMod |
+| UltraTracker | .ult | | Xmp |
 | Unic Tracker | .unic | ProWizard | ModTracker |
 | UniMod | .uni | MikMod Converter | MikMod |
 | Unis 669 | .669 | | Xmp |

diff --git a/Source/Agents/ModuleConverters/MikModConverter/MikModConverter.cs b/Source/Agents/ModuleConverters/MikModConverter/MikModConverter.cs
@@ -79,7 +79,7 @@ public override AgentSupportInfo[] AgentInformation
 //					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT10, Resources.IDS_MIKCONV_DESCRIPTION_AGENT10, agent10Id),
 //					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT11, Resources.IDS_MIKCONV_DESCRIPTION_AGENT11, agent11Id),
 //					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT12, Resources.IDS_MIKCONV_DESCRIPTION_AGENT12, agent12Id),
-					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT13, Resources.IDS_MIKCONV_DESCRIPTION_AGENT13, agent13Id),
+//					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT13, Resources.IDS_MIKCONV_DESCRIPTION_AGENT13, agent13Id),
 					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT14, Resources.IDS_MIKCONV_DESCRIPTION_AGENT14, agent14Id),
 					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT15, Resources.IDS_MIKCONV_DESCRIPTION_AGENT15, agent15Id),
 //					new AgentSupportInfo(Resources.IDS_MIKCONV_NAME_AGENT16, Resources.IDS_MIKCONV_DESCRIPTION_AGENT16, agent16Id)

diff --git a/Source/Agents/Players/Xmp/Xmp.cs b/Source/Agents/Players/Xmp/Xmp.cs
@@ -22,7 +22,7 @@ namespace Polycode.NostalgicPlayer.Agent.Player.Xmp
 	/// </summary>
 	public class Xmp : AgentBase, IPlayerAgentMultipleFormatIdentify
 	{
-		internal static readonly string[] fileExtensions = { "gdm", "xm", "oxm", "s3m", "it", "669", "amf", "far", "imf", "stm", "stx" };
+		internal static readonly string[] fileExtensions = { "gdm", "xm", "oxm", "s3m", "it", "669", "amf", "far", "imf", "stm", "stx", "ult" };
 
 		#region IAgent implementation
 		/********************************************************************/

diff --git a/Source/Ports/LibXmp/Format.cs b/Source/Ports/LibXmp/Format.cs
@@ -15,7 +15,7 @@ namespace Polycode.NostalgicPlayer.Ports.LibXmp
 	/// </summary>
 	internal class Format
 	{
-		private const int Num_Formats = 13;
+		private const int Num_Formats = 14;
 		private const int Num_Pw_Formats = 0;
 
 		private static readonly Xmp_Format_Info[] _fArray = new Xmp_Format_Info[Num_Formats + Num_Pw_Formats + 1];
@@ -32,6 +32,7 @@ internal class Format
 			Stm_Load.LibXmp_Loader_Stm,
 			Stx_Load.LibXmp_Loader_Stx,
 			Imf_Load.LibXmp_Loader_Imf,
+			Ult_Load.LibXmp_Loader_Ult,
 			Amf_Load.LibXmp_Loader_Amf,
 			Asylum_Load.LibXmp_Loader_Asylum,
 			Gdm_Load.LibXmp_Loader_Gdm,

diff --git a/Source/Ports/LibXmp/Loaders/Stx_Load.cs b/Source/Ports/LibXmp/Loaders/Stx_Load.cs
@@ -22,7 +22,7 @@ internal class Stx_Load : IFormatLoader
 	{
 		#region Internal structures
 
-		#region S3M_File_Header
+		#region Stx_File_Header
 		private class Stx_File_Header
 		{
 			public uint8[] Name = new uint8[20];		// Song name
@@ -48,7 +48,7 @@ private class Stx_File_Header
 		}
 		#endregion
 
-		#region S3M_File_Header
+		#region Stx_Instrument_Header
 		private class Stx_Instrument_Header
 		{
 			public uint8 Type;							// Instrument type