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

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

Revision: 1314
          http://modplug.svn.sourceforge.net/modplug/?rev=1314&view=rev
Author:   saga-games
Date:     2012-07-01 17:50:45 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
[Fix] Fade song emitted a noise burst since revision 1282.
[Mod] OpenMPT: Version is now 1.20.01.11

Revision Links:
--------------
    http://modplug.svn.sourceforge.net/modplug/?rev=1282&view=rev

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/version.h
    trunk/OpenMPT/soundlib/Fastmix.cpp
    trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2012-07-01 17:23:31 UTC (rev 1313)
+++ trunk/OpenMPT/mptrack/version.h	2012-07-01 17:50:45 UTC (rev 1314)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					01
-#define VER_MINORMINOR				10
+#define VER_MINORMINOR				11
 
 //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/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp	2012-07-01 17:23:31 UTC (rev 1313)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp	2012-07-01 17:50:45 UTC (rev 1314)
@@ -1695,8 +1695,6 @@
 }
 
 
-extern int gbInitPlugins;
-
 void CSoundFile::ProcessPlugins(UINT nCount)
 //------------------------------------------
 {
@@ -1710,11 +1708,6 @@
 			&& plugin.pMixState->pOutBufferR != nullptr)
 		{
 			SNDMIXPLUGINSTATE *pState = plugin.pMixState;
-			// Init plugins ?
-			/*if (gbInitPlugins)
-			{   //ToDo: do this in resume.
-				pPlugin->pMixPlugin->Init(gdwMixingFreq, (gbInitPlugins & 2) ? TRUE : FALSE);
-			}*/
 
 			//We should only ever reach this point if the song is playing.
 			if (!plugin.pMixPlugin->IsSongPlaying())
@@ -1832,7 +1825,6 @@
 		}
 	}
 	FloatToStereoMix(pMixL, pMixR, MixSoundBuffer, nCount);
-	gbInitPlugins = 0;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2012-07-01 17:23:31 UTC (rev 1313)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2012-07-01 17:50:45 UTC (rev 1314)
@@ -51,7 +51,6 @@
 PMIXPLUGINCREATEPROC CSoundFile::gpMixPluginCreateProc = NULL;
 LONG gnDryROfsVol = 0;
 LONG gnDryLOfsVol = 0;
-int gbInitPlugins = 0;
 bool gbInitTables = 0;
 
 typedef DWORD (MPPASMCALL * LPCONVERTPROC)(LPVOID, int *, DWORD);
@@ -242,7 +241,6 @@
 #ifdef ENABLE_EQ
 	InitializeEQ(bReset);
 #endif
-	gbInitPlugins = (bReset) ? 3 : 1;
 	return TRUE;
 }
 
@@ -254,7 +252,7 @@
 	if (nsamples <= 0) return FALSE;
 	if (nsamples > 0x100000) nsamples = 0x100000;
 	m_nBufferCount = nsamples;
-	samplecount_t nRampLength = m_nBufferCount;
+	int nRampLength = static_cast<int>(m_nBufferCount);
 	// Ramp everything down
 	for (UINT noff=0; noff < m_nMixChannels; noff++)
 	{
@@ -2410,7 +2408,7 @@
 			ModCommand::NOTE realNote = note;
 			if(ModCommand::IsNote(note))
 				realNote = pIns->NoteMap[note - 1];
-			pPlugin->MidiCommand(GetBestMidiChannel(nChn), pIns->nMidiProgram, pIns->wMidiBank, realNote, pChn->nVolume, nChn);
+			pPlugin->MidiCommand(GetBestMidiChannel(nChn), pIns->nMidiProgram, pIns->wMidiBank, realNote, static_cast<uint16>(pChn->nVolume), nChn);
 		} else if (volcmd == VOLCMD_VOLUME)
 		{
 			pPlugin->MidiCC(GetBestMidiChannel(nChn), MIDIEvents::MIDICC_Volume_Fine, vol, nChn);

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