[OMPT-svn-commit] SF.net SVN: modplug:[925] trunk/OpenMPT/soundlib/modcommand.cpp

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

Revision: 925
          http://modplug.svn.sourceforge.net/modplug/?rev=925&view=rev
Author:   saga-games
Date:     2011-07-22 21:52:30 +0000 (Fri, 22 Jul 2011)

Log Message:
-----------
[Fix] Mod Conversion: Global volume ranges were not updated when converting between IT and S3M/XM.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/modcommand.cpp

Modified: trunk/OpenMPT/soundlib/modcommand.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modcommand.cpp	2011-07-22 21:31:18 UTC (rev 924)
+++ trunk/OpenMPT/soundlib/modcommand.cpp	2011-07-22 21:52:30 UTC (rev 925)
@@ -328,11 +328,38 @@
 		case CMD_SMOOTHMIDI:
 			m->command = CMD_MIDI;
 			break;
+		case CMD_GLOBALVOLUME:
+			m->param = (min(0x80, m->param) + 1) / 2;
+			break;
 		default:
 			break;
 		}
 	} // End if (oldTypeIsIT_MPT && newTypeIsS3M)
 
+	//////////////////////
+	// Convert IT to XM
+	if(oldTypeIsIT_MPT && newTypeIsXM)
+	{
+		switch(m->command)
+		{
+		case CMD_GLOBALVOLUME:
+			m->param = (min(0x80, m->param) + 1) / 2;
+			break;
+		}
+	} // End if(oldTypeIsIT_MPT && newTypeIsXM)
+
+	//////////////////////
+	// Convert XM to IT
+	if(oldTypeIsXM && newTypeIsIT_MPT)
+	{
+		switch(m->command)
+		{
+		case CMD_GLOBALVOLUME:
+			m->param = min(0x80, m->param * 2);
+			break;
+		}
+	} // End if(oldTypeIsIT_MPT && newTypeIsXM)
+
 	///////////////////////////////////
 	// MOD <-> XM: Speed/Tempo update
 	if(oldTypeIsMOD && newTypeIsXM)


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