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

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

Revision: 1551
          http://sourceforge.net/p/modplug/code/1551
Author:   saga-games
Date:     2013-03-09 14:21:31 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
[Fix] SCx shouldn't click anymore in IT compatible or S3M playback mode (just like normal note cuts).
[Ref] Removed unused function ModSequence::WriteToByteArray

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/ModChannel.h
    trunk/OpenMPT/soundlib/ModSequence.cpp
    trunk/OpenMPT/soundlib/ModSequence.h
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/ModChannel.h
===================================================================
--- trunk/OpenMPT/soundlib/ModChannel.h	2013-03-06 21:48:34 UTC (rev 1550)
+++ trunk/OpenMPT/soundlib/ModChannel.h	2013-03-09 14:21:31 UTC (rev 1551)
@@ -84,7 +84,7 @@
 	uint8 nNewNote, nNewIns, nCommand, nArpeggio;
 	uint8 nOldVolumeSlide, nOldFineVolUpDown;
 	uint8 nOldPortaUpDown, nOldFinePortaUpDown, nOldExtraFinePortaUpDown;
-	uint8 nOldPanSlide, nOldChnVolSlide, nOldVolColSlide;
+	uint8 nOldPanSlide, nOldChnVolSlide;
 	uint8 nVibratoType, nVibratoSpeed, nVibratoDepth;
 	uint8 nTremoloType, nTremoloSpeed, nTremoloDepth;
 	uint8 nPanbrelloType, nPanbrelloSpeed, nPanbrelloDepth;

Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp	2013-03-06 21:48:34 UTC (rev 1550)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp	2013-03-09 14:21:31 UTC (rev 1551)
@@ -638,27 +638,6 @@
 }
 
 
-size_t ModSequence::WriteToByteArray(BYTE* dest, const UINT numOfBytes, const UINT destSize) const
-//------------------------------------------------------------------------------------------------
-{
-	if(numOfBytes > destSize || numOfBytes > MAX_ORDERS) return true;
-
-	const size_t limit = min(numOfBytes, GetLength());
-
-	size_t i = 0;
-	for(i = 0; i < limit; i++)
-	{
-		dest[i] = static_cast<BYTE>((*this)[i]);
-	}
-	// Fill non-existing order items with stop indices
-	for(i = limit; i < numOfBytes; i++)
-	{
-		dest[i] = 0xFF;
-	}
-	return i; //Returns the number of bytes written.
-}
-
-
 size_t ModSequence::WriteAsByte(FILE* f, const uint16 count) const
 //----------------------------------------------------------------
 {

Modified: trunk/OpenMPT/soundlib/ModSequence.h
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.h	2013-03-06 21:48:34 UTC (rev 1550)
+++ trunk/OpenMPT/soundlib/ModSequence.h	2013-03-09 14:21:31 UTC (rev 1551)
@@ -96,7 +96,6 @@
 
 	// Read/write.
 	size_t WriteAsByte(FILE* f, const uint16 count) const;
-	size_t WriteToByteArray(BYTE* dest, const UINT numOfBytes, const UINT destSize) const;
 	bool ReadAsByte(const BYTE* pFrom, const int howMany, const int memLength);
 	bool ReadAsByte(FileReader &file, size_t howMany);
 	template<typename T, size_t arraySize>

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-03-06 21:48:34 UTC (rev 1550)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-03-09 14:21:31 UTC (rev 1551)
@@ -2057,12 +2057,12 @@
 					// Test case: VolColMemory.it
 					if(vol == 0 && IsCompatibleMode(TRK_IMPULSETRACKER))
 					{
-						vol = pChn->nOldVolColSlide;
+						vol = pChn->nOldVolParam;
 						if(vol == 0)
 							break;
 					} else
 					{
-						pChn->nOldVolColSlide = vol;
+						pChn->nOldVolParam = vol;
 					}
 					VolumeSlide(pChn, volcmd == VOLCMD_VOLSLIDEUP ? (vol << 4) : vol);
 					break;
@@ -3216,7 +3216,7 @@
 		if(param) pChn->nOldFineVolUpDown = (param << 4) | (pChn->nOldFineVolUpDown & 0x0F); else param = (pChn->nOldFineVolUpDown >> 4);
 	} else if(volCol)
 	{
-		if(param) pChn->nOldVolColSlide = param; else param = pChn->nOldVolColSlide;
+		if(param) pChn->nOldVolParam = param; else param = pChn->nOldVolParam;
 	} else
 	{
 		if(param) pChn->nOldFineVolUpDown = param; else param = pChn->nOldFineVolUpDown;
@@ -3241,7 +3241,7 @@
 		if(param) pChn->nOldFineVolUpDown = param | (pChn->nOldFineVolUpDown & 0xF0); else param = (pChn->nOldFineVolUpDown & 0x0F);
 	} else if(volCol)
 	{
-		if(param) pChn->nOldVolColSlide = param; else param = pChn->nOldVolColSlide;
+		if(param) pChn->nOldVolParam = param; else param = pChn->nOldVolParam;
 	} else
 	{
 		if(param) pChn->nOldFineVolUpDown = param; else param = pChn->nOldFineVolUpDown;
@@ -4250,14 +4250,13 @@
 	if (m_nTickCount == nTick)
 	{
 		ModChannel *pChn = &Chn[nChn];
-		// if (m_nInstruments) KeyOff(pChn); ?
 		pChn->nVolume = 0;
 		// S3M/IT compatibility: Note Cut really cuts notes and does not just mute them (so that following volume commands could restore the sample)
 		// Test case: scx.it
 		if(IsCompatibleMode(TRK_IMPULSETRACKER|TRK_SCREAMTRACKER))
 		{
-			pChn->nLength = 0;
-			pChn->nPos = pChn->nPosLo = 0;
+			pChn->nFadeOutVol = 0;
+			pChn->dwFlags.set(CHN_NOTEFADE);
 		}
 		pChn->dwFlags.set(CHN_FASTVOLRAMP);
 

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