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

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

Revision: 522
          http://modplug.svn.sourceforge.net/modplug/?rev=522&view=rev
Author:   saga-games
Date:     2010-03-09 20:25:43 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
[Fix] Just because a variable is called "dwSomething", doesn't mean that it's supposed to be DWORD... Fixed a few variable conversions in GetLength() - Now, OpenMPT reports that Paul Legovitch's Intro.it is 58785320 minutes long instead of 0 seconds, which is not exactly correct, but the previous length was not correct either...

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-03-09 18:42:49 UTC (rev 521)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-03-09 20:25:43 UTC (rev 522)
@@ -90,7 +90,7 @@
 	ORDERINDEX nCurrentPattern = 0;
 	ORDERINDEX nNextPattern = 0;
 	PATTERNINDEX nPattern = Order[0];
-	DOUBLE dwElapsedTime=0.0;
+	double dElapsedTime=0.0;
 // -! NEW_FEATURE#0022
 	UINT nMusicSpeed=m_nDefaultSpeed, nMusicTempo=m_nDefaultTempo, nNextRow=0;
 	UINT nMaxRow = 0, nMaxPattern = 0;
@@ -101,7 +101,7 @@
 	BYTE vols[MAX_CHANNELS];
 	BYTE oldparam[MAX_CHANNELS];
 	UINT chnvols[MAX_CHANNELS];
-	DWORD patloop[MAX_CHANNELS];
+	double patloop[MAX_CHANNELS];
 	
 	memset(instr, 0, sizeof(instr));
 	memset(notes, 0, sizeof(notes));
@@ -209,7 +209,7 @@
 		if (!nRow)
 		{
 			for(UINT ipck = 0; ipck < m_nChannels; ipck++)
-				patloop[ipck] = (DWORD)dwElapsedTime;
+				patloop[ipck] = dElapsedTime;
 		}
 		if (!bTotal)
 		{
@@ -316,8 +316,8 @@
 				if ((param & 0xF0) == 0xE0) nSpeedCount = (param & 0x0F) * nMusicSpeed; else
 				if ((param & 0xF0) == 0x60)
 				{
-					if (param & 0x0F) dwElapsedTime += (dwElapsedTime - patloop[nChn]) * (param & 0x0F);
-					else patloop[nChn] = (DWORD)dwElapsedTime;
+					if (param & 0x0F) dElapsedTime += (dElapsedTime - patloop[nChn]) * (double)(param & 0x0F);
+					else patloop[nChn] = dElapsedTime;
 				}
 				break;
 			case CMD_XFINEPORTAUPDOWN:
@@ -432,11 +432,11 @@
 		nSpeedCount += nMusicSpeed;
 		switch(m_nTempoMode) {
 			case tempo_mode_alternative: 
-				dwElapsedTime +=  60000.0 / (1.65625 * (double)(nMusicSpeed * nMusicTempo)); break;
+				dElapsedTime +=  60000.0 / (1.65625 * (double)(nMusicSpeed * nMusicTempo)); break;
 			case tempo_mode_modern: 
-				dwElapsedTime += 60000.0/(double)nMusicTempo / (double)m_nRowsPerBeat; break;
+				dElapsedTime += 60000.0/(double)nMusicTempo / (double)m_nRowsPerBeat; break;
 			case tempo_mode_classic: default:
-				dwElapsedTime += (2500.0 * (double)nSpeedCount) / (double)nMusicTempo;
+				dElapsedTime += (2500.0 * (double)nSpeedCount) / (double)nMusicTempo;
 		}
 	}
 
@@ -457,7 +457,7 @@
 		}
 	}
 
-	return dwElapsedTime / 1000.0;
+	return dElapsedTime / 1000.0;
 
 }
 


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