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

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

Revision: 1021
          http://modplug.svn.sourceforge.net/modplug/?rev=1021&view=rev
Author:   saga-games
Date:     2011-09-04 19:12:08 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
[Fix] Mod Conversion: Various instrument properties were not cleared when converting to XM; Sample sustain loops were also not removed.
[Mod] OpenMPT: Version is now 1.20.00.18

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/ModConvert.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/ModConvert.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ModConvert.cpp	2011-09-04 19:02:27 UTC (rev 1020)
+++ trunk/OpenMPT/mptrack/ModConvert.cpp	2011-09-04 19:12:08 UTC (rev 1021)
@@ -266,7 +266,7 @@
 			CHANGEMODTYPE_WARNING(wMOD31Samples);
 		}
 
-		// No Bidi / Sustain loops / Autovibrato for MOD/S3M
+		// No Bidi and Autovibrato for MOD/S3M
 		if(newTypeIsMOD || newTypeIsS3M)
 		{
 			// Bidi loops
@@ -276,6 +276,17 @@
 				CHANGEMODTYPE_WARNING(wSampleBidiLoops);
 			}
 
+			// Autovibrato
+			if(sample.nVibDepth || sample.nVibRate || sample.nVibSweep)
+			{
+				sample.nVibDepth = sample.nVibRate = sample.nVibSweep = sample.nVibType = 0;
+				CHANGEMODTYPE_WARNING(wSampleAutoVibrato);
+			}
+		}
+
+		// No sustain loops for MOD/S3M/XM
+		if(newTypeIsMOD_XM || newTypeIsS3M)
+		{
 			// Sustain loops - convert to normal loops
 			if((sample.uFlags & CHN_SUSTAINLOOP) != 0)
 			{
@@ -287,13 +298,6 @@
 			}
 			sample.nSustainStart = sample.nSustainEnd = 0;
 			sample.uFlags &= ~(CHN_SUSTAINLOOP|CHN_PINGPONGSUSTAIN);
-
-			// Autovibrato
-			if(sample.nVibDepth || sample.nVibRate || sample.nVibSweep)
-			{
-				sample.nVibDepth = sample.nVibRate = sample.nVibSweep = sample.nVibType = 0;
-				CHANGEMODTYPE_WARNING(wSampleAutoVibrato);
-			}
 		}
 
 		// Transpose to Frequency (MOD/XM to S3M/IT/MPT)
@@ -378,6 +382,17 @@
 				pIns->dwFlags &= ~INS_SETPANNING;
 				pIns->nIFC &= 0x7F;
 				pIns->nIFR &= 0x7F;
+				pIns->nFilterMode = FLTMODE_UNCHANGED;
+
+				pIns->nCutSwing = pIns->nPanSwing = pIns->nResSwing = pIns->nVolSwing = 0;
+
+				pIns->wPitchToTempoLock = 0;
+
+				pIns->nPPC = NOTE_MIDDLEC - 1;
+				pIns->nPPS = 0;
+
+				pIns->nGlobalVol = 64;
+				pIns->nPan = 128;
 			}
 		}
 		// Convert MPT to anything - remove instrument tunings

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-09-04 19:02:27 UTC (rev 1020)
+++ trunk/OpenMPT/mptrack/version.h	2011-09-04 19:12:08 UTC (rev 1021)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					00
-#define VER_MINORMINOR				17
+#define VER_MINORMINOR				18
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

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