[OMPT-svn-commit] SF.net SVN: modplug:[4412] trunk/OpenMPT

[<sag...@us...>]

Revision: 4412
          http://sourceforge.net/p/modplug/code/4412
Author:   saga-games
Date:     2014-10-10 19:49:53 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
[Mod] Add IceTracker/SoundTracker 2.6 extensions (ICE = xmp extension, ST26 = ModLand extension) to various parts of the program.

Modified Paths:
--------------
    trunk/OpenMPT/installer/filetypes.iss
    trunk/OpenMPT/libopenmpt/foo_openmpt.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/soundlib/Tables.cpp

Modified: trunk/OpenMPT/installer/filetypes.iss
===================================================================
--- trunk/OpenMPT/installer/filetypes.iss	2014-10-10 19:40:50 UTC (rev 4411)
+++ trunk/OpenMPT/installer/filetypes.iss	2014-10-10 19:49:53 UTC (rev 4412)
@@ -29,6 +29,7 @@
 Name: "associate_exotic\far"; Description: "Farandole Composer (FAR)";
 Name: "associate_exotic\gdm"; Description: "General Digital Music (GDM)";
 Name: "associate_exotic\imf"; Description: "Imago Orpheus (IMF)";
+Name: "associate_exotic\ice"; Description: "Ice Tracker (ICE)";
 Name: "associate_exotic\j2b"; Description: "Jazz Jackrabbit 2 Music (J2B)";
 Name: "associate_exotic\m15"; Description: "Ultimate Soundtracker (M15)";
 Name: "associate_exotic\mdl"; Description: "DigiTrakker (MDL)";
@@ -70,6 +71,7 @@
 Root: HKCR; Subkey: ".far"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\far
 Root: HKCR; Subkey: ".gdm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\gdm
 Root: HKCR; Subkey: ".imf"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\imf
+Root: HKCR; Subkey: ".ice"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\ice
 Root: HKCR; Subkey: ".j2b"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\j2b
 Root: HKCR; Subkey: ".m15"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\m15
 Root: HKCR; Subkey: ".mdl"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\mdl

Modified: trunk/OpenMPT/libopenmpt/foo_openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/foo_openmpt.cpp	2014-10-10 19:40:50 UTC (rev 4411)
+++ trunk/OpenMPT/libopenmpt/foo_openmpt.cpp	2014-10-10 19:49:53 UTC (rev 4412)
@@ -289,6 +289,8 @@
 	"*.nst" ";"
 	"*.m15" ";"
 	"*.stk" ";"
+	"*.st26" ";"
+	"*.ice" ";"
 	"*.wow" ";"
 	"*.ult" ";"
 	"*.669" ";"

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2014-10-10 19:40:50 UTC (rev 4411)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2014-10-10 19:49:53 UTC (rev 4412)
@@ -1191,7 +1191,7 @@
 	static int nFilterIndex = 0;
 	FileDialog dlg = OpenFileDialog()
 		.AllowMultiSelect()
-		.ExtensionFilter("All Modules|" + exts +
+		.ExtensionFilter("All Modules|" + exts + ";mod.*"
 		"|"
 		"Compressed Modules (*.mdz;*.s3z;*.xmz;*.itz"
 #ifndef NO_MO3
@@ -1202,7 +1202,7 @@
 		";*.mo3"
 #endif
 		"|"
-		"ProTracker Modules (*.mod,*.nst)|*.mod;mod.*;*.mdz;*.nst;*.m15|"
+		"ProTracker Modules (*.mod,*.nst)|*.mod;mod.*;*.mdz;*.nst;*.m15;*.stk|"
 		"ScreamTracker Modules (*.s3m,*.stm)|*.s3m;*.stm;*.s3z|"
 		"FastTracker Modules (*.xm)|*.xm;*.xmz|"
 		"Impulse Tracker Modules (*.it)|*.it;*.itz|"
@@ -1211,7 +1211,7 @@
 		"Impulse Tracker Projects (*.itp)|*.itp;*.itpz|"
 		// -! NEW_FEATURE#0023
 		"OpenMPT Modules (*.mptm)|*.mptm;*.mptmz|"
-		"Other Modules (mtm,okt,mdl,669,far,...)|*.mtm;*.669;*.ult;*.wow;*.far;*.mdl;*.okt;*.dmf;*.ptm;*.med;*.ams;*.dbm;*.digi;*.dsm;*.umx;*.amf;*.psm;*.mt2;*.gdm;*.imf;*.j2b|"
+		"Other Modules (mtm,okt,mdl,669,far,...)|*.mtm;*.669;*.ult;*.wow;*.far;*.mdl;*.okt;*.dmf;*.ptm;*.med;*.ams;*.dbm;*.digi;*.dsm;*.umx;*.amf;*.psm;*.mt2;*.gdm;*.imf;*.j2b;*.ice;*.st26|"
 		"Wave Files (*.wav)|*.wav|"
 		"MIDI Files (*.mid,*.rmi)|*.mid;*.rmi;*.smf|"
 		"All Files (*.*)|*.*||")

Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp	2014-10-10 19:40:50 UTC (rev 4411)
+++ trunk/OpenMPT/soundlib/Tables.cpp	2014-10-10 19:49:53 UTC (rev 4412)
@@ -41,7 +41,7 @@
 	const char *extension;	// "mod"
 };
 
-// remember to also update libopenmpt/libopenmpt_foobar2000.cpp (all other plugins read these dynamically)
+// remember to also update libopenmpt/foo_openmpt.cpp (all other plugins read these dynamically)
 static const ModFormatInfo modFormatInfo[] =
 {
 	{ MOD_TYPE_MOD,		"ProTracker",				"mod" },
@@ -56,6 +56,8 @@
 	{ MOD_TYPE_MOD,		"NoiseTracker",				"nst" },
 	{ MOD_TYPE_MOD,		"Soundtracker",				"m15" },
 	{ MOD_TYPE_MOD,		"Soundtracker",				"stk" },
+	{ MOD_TYPE_MOD,		"SoundTracker 2.6",			"st26" },
+	{ MOD_TYPE_MOD,		"Ice Tracker",				"ice" },
 	{ MOD_TYPE_MOD,		"Mod's Grave",				"wow" },
 	{ MOD_TYPE_ULT,		"UltraTracker",				"ult" },
 	{ MOD_TYPE_669,		"Composer 669 / UNIS 669",	"669" },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.