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

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

Revision: 892
          http://modplug.svn.sourceforge.net/modplug/?rev=892&view=rev
Author:   saga-games
Date:     2011-06-04 23:49:38 +0000 (Sat, 04 Jun 2011)

Log Message:
-----------
[Fix] Rendering sub songs to WAV resulted in an endless render loop.

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

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2011-06-03 20:31:55 UTC (rev 891)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2011-06-04 23:49:38 UTC (rev 892)
@@ -788,8 +788,11 @@
 #ifdef MODPLUG_TRACKER
 				// Let's check again if this really is the end of the song.
 				// The visited rows vector might have been screwed up while editing...
+				// This is of course not possible during rendering to WAV, so we ignore that case.
 				GetLengthType t = GetLength(eNoAdjust);
-				if(t.lastOrder == m_nCurrentPattern && t.lastRow == m_nRow)
+				if((gdwSoundSetup & SNDMIX_DIRECTTODISK) || (t.lastOrder == m_nCurrentPattern && t.lastRow == m_nRow))
+#else
+				if(1)
 #endif // MODPLUG_TRACKER
 				{
 					// This is really the song's end!
@@ -1048,7 +1051,7 @@
 
 			if(pChn->nVolSwing)
 			{
-				if(!(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) || GetModFlag(MSF_OLDVOLSWING))
+				if(GetModFlag(MSF_OLDVOLSWING))
 				{
 					vol += pChn->nVolSwing;
 				}


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