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

[<man...@us...>]

Revision: 3841
          http://sourceforge.net/p/modplug/code/3841
Author:   manxorist
Date:     2014-03-07 12:46:56 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
[Ref] Replace WORD with uint16.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/modsmp_ctrl.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2014-03-07 12:45:14 UTC (rev 3840)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2014-03-07 12:46:56 UTC (rev 3841)
@@ -158,7 +158,7 @@
 static void ReadTuningMap(std::istream& iStrm, CSoundFile& csf, const size_t = 0)
 //-------------------------------------------------------------------------------
 {
-	typedef std::map<WORD, std::string> MAP;
+	typedef std::map<uint16, std::string> MAP;
 	typedef MAP::iterator MAP_ITER;
 	MAP shortToTNameMap;
 	ReadTuningMapTemplate<uint16, uint8>(iStrm, shortToTNameMap);

Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2014-03-07 12:45:14 UTC (rev 3840)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2014-03-07 12:46:56 UTC (rev 3841)
@@ -495,7 +495,7 @@
 	{
 		CriticalSection cs;
 
-		smp.nGlobalVol = MIN((WORD)(smp.nGlobalVol / dAmplify), 64);
+		smp.nGlobalVol = MIN((uint16)(smp.nGlobalVol / dAmplify), 64);
 		for (CHANNELINDEX i = 0; i < MAX_CHANNELS; i++)
 		{
 			if(sndFile.m_PlayState.Chn[i].pModSample == &smp)

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