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

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

Revision: 2596
          http://sourceforge.net/p/modplug/code/2596
Author:   saga-games
Date:     2013-08-10 22:19:41 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
[Mod] Don't try saving channel volume effects in XM files
[Imp] Also show flac files when loading instruments in instrument view

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/soundlib/Load_mod.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-08-10 18:08:43 UTC (rev 2595)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-08-10 22:19:41 UTC (rev 2596)
@@ -1682,7 +1682,7 @@
 	static int nLastIndex = 0;
 
 	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, "", "",
-		"All Instruments|*.xi;*.pat;*.iti;*.wav;*.aif;*.aiff|"
+		"All Instruments|*.xi;*.pat;*.iti;*.flac;*.wav;*.aif;*.aiff|"
 		"FastTracker II Instruments (*.xi)|*.xi|"
 		"GF1 Patches (*.pat)|*.pat|"
 		"Impulse Tracker Instruments (*.iti)|*.iti|"

Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	2013-08-10 18:08:43 UTC (rev 2595)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	2013-08-10 22:19:41 UTC (rev 2596)
@@ -46,8 +46,8 @@
 	case 'H' - 55:	m.command = CMD_GLOBALVOLSLIDE; break;
 	case 'K' - 55:	m.command = CMD_KEYOFF; break;
 	case 'L' - 55:	m.command = CMD_SETENVPOSITION; break;
-	case 'M' - 55:	m.command = CMD_CHANNELVOLUME; break;
-	case 'N' - 55:	m.command = CMD_CHANNELVOLSLIDE; break;
+	case 'M' - 55:	m.command = CMD_CHANNELVOLUME; break;		// Wat. Luckily, MPT never allowed this to be entered in patterns...
+	case 'N' - 55:	m.command = CMD_CHANNELVOLSLIDE; break;		// Ditto.
 	case 'P' - 55:	m.command = CMD_PANNINGSLIDE; break;
 	case 'R' - 55:	m.command = CMD_RETRIG; break;
 	case 'T' - 55:	m.command = CMD_TREMOR; break;
@@ -124,8 +124,6 @@
 	case CMD_GLOBALVOLSLIDE:	command = 'H' - 55; break;
 	case CMD_KEYOFF:			command = 'K' - 55; break;
 	case CMD_SETENVPOSITION:	command = 'L' - 55; break;
-	case CMD_CHANNELVOLUME:		command = 'M' - 55; break;
-	case CMD_CHANNELVOLSLIDE:	command = 'N' - 55; break;
 	case CMD_PANNINGSLIDE:		command = 'P' - 55; break;
 	case CMD_RETRIG:			command = 'R' - 55; break;
 	case CMD_TREMOR:			command = 'T' - 55; break;

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