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

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

Revision: 1411
          http://modplug.svn.sourceforge.net/modplug/?rev=1411&view=rev
Author:   saga-games
Date:     2012-10-28 23:16:13 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
[Fix] Importing DLS/SF2 samples into the sample editor does now properly remove sample attributes not supported by the current format.
[Mod] OpenMPT: Version is now 1.20.04.01

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/version.h
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/ModSample.cpp

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2012-10-28 22:57:35 UTC (rev 1410)
+++ trunk/OpenMPT/mptrack/version.h	2012-10-28 23:16:13 UTC (rev 1411)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					04
-#define VER_MINORMINOR				00
+#define VER_MINORMINOR				01
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2012-10-28 22:57:35 UTC (rev 1410)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2012-10-28 23:16:13 UTC (rev 1411)
@@ -1503,6 +1503,7 @@
 			sample.nC5Speed = p->dwSampleRate;
 			sample.RelativeTone = p->byOriginalPitch;
 			sample.nFineTune = p->chPitchCorrection;
+			sample.Convert(MOD_TYPE_IT, pSndFile->GetType());
 
 			SampleIO(
 				SampleIO::_16bit,
@@ -1604,6 +1605,7 @@
 			}
 		}
 		if (pDlsIns->szName[0]) memcpy(pSndFile->m_szNames[nSample], pDlsIns->szName, MAX_SAMPLENAME - 1);
+		sample.Convert(MOD_TYPE_IT, pSndFile->GetType());
 		bOk = TRUE;
 	}
 	FreeWaveForm(pWaveForm);

Modified: trunk/OpenMPT/soundlib/ModSample.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSample.cpp	2012-10-28 22:57:35 UTC (rev 1410)
+++ trunk/OpenMPT/soundlib/ModSample.cpp	2012-10-28 23:16:13 UTC (rev 1411)
@@ -18,7 +18,7 @@
 //-------------------------------------------------------
 {
 	// Convert between frequency and transpose values if necessary.
-	if ((!(toType & (MOD_TYPE_MOD | MOD_TYPE_XM))) && (fromType & (MOD_TYPE_MOD | MOD_TYPE_XM)))
+	if((!(toType & (MOD_TYPE_MOD | MOD_TYPE_XM))) && (fromType & (MOD_TYPE_MOD | MOD_TYPE_XM)))
 	{
 		TransposeToFrequency();
 		RelativeTone = 0;
@@ -43,9 +43,10 @@
 		nVibType = VIB_SINE;
 	}
 
-	// No sustain loops for MOD/S3M/XM
+	// No global volume sustain loops for MOD/S3M/XM
 	if(toType & (MOD_TYPE_MOD | MOD_TYPE_XM | MOD_TYPE_S3M))
 	{
+		nGlobalVol = 64;
 		// Sustain loops - convert to normal loops
 		if((uFlags & CHN_SUSTAINLOOP) != 0)
 		{

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