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

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

Revision: 283
          http://modplug.svn.sourceforge.net/modplug/?rev=283&view=rev
Author:   saga-games
Date:     2009-07-06 21:48:54 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
[Mod] Sample editor: DC offset removal won't affect default volume, global volume won't be set when only parts of a sample are being processed
[Imp] Note properties: Added description for S1x - Glissando Control

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/soundlib/modsmp_ctrl.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2009-07-06 17:34:31 UTC (rev 282)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2009-07-06 21:48:54 UTC (rev 283)
@@ -2638,6 +2638,12 @@
 				{
 					switch(param & 0xF0)
 					{
+					case 0x10:
+						if((param & 0x0F) == 0)
+							strcpy(s, "smooth");
+						else
+							strcpy(s, "semitones");
+						break;					
 					case 0x30:
 					case 0x40:
 					case 0x50:

Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2009-07-06 17:34:31 UTC (rev 282)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2009-07-06 21:48:54 UTC (rev 283)
@@ -279,11 +279,9 @@
 	else if(pins->GetElementarySampleSize() == 1)
 		RemoveOffsetAndNormalize( reinterpret_cast<int8*>(pins->pSample) + iStart, iEnd - iStart, dOffset, dAmplify);
 	
-	// step 3: adjust either global vol or default vol of this sample
-	if(modtype == MOD_TYPE_IT || modtype == MOD_TYPE_MPT)
+	// step 3: adjust global vol (if available)
+	if((modtype & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (iStart == 0) && (iEnd = pins->nLength))
 		pins->nGlobalVol = min((WORD)(pins->nGlobalVol / dAmplify), 64);
-	else if(modtype != MOD_TYPE_NONE)
-		pins->nVolume = min((WORD)(pins->nVolume / dAmplify), 256);
 
 	AdjustEndOfSample(smp, pSndFile);
 


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