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

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

Revision: 3815
          http://sourceforge.net/p/modplug/code/3815
Author:   manxorist
Date:     2014-03-03 17:47:01 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
[Fix] Fix typo in panning command handling.
[Ref] Silence signed/unsigned comparison warnings.

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-03 16:46:26 UTC (rev 3814)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-03 17:47:01 UTC (rev 3815)
@@ -494,7 +494,7 @@
 					if (!(GetType() & GLOBALVOL_7BIT_FORMATS)) param <<= 1;
 					memory.state.m_nGlobalVolume -= param * (memory.state.m_nMusicSpeed - 1);
 				}
-				memory.state.m_nGlobalVolume = CLAMP(memory.state.m_nGlobalVolume, 0, 256);
+				memory.state.m_nGlobalVolume = Clamp(memory.state.m_nGlobalVolume, 0u, 256u);
 				break;
 			case CMD_CHANNELVOLUME:
 				if (param <= 64) pChn->nGlobalVol = param;
@@ -507,7 +507,7 @@
 				} else
 				if (((param & 0xF0) == 0xF0) && (param & 0x0F))
 				{
-					if (pChn->nGlobalVol > (UINT)(param & 0x0F)) param = pChn->nGlobalVol - (param & 0x0F);
+					if (pChn->nGlobalVol > (param & 0x0F)) param = pChn->nGlobalVol - (param & 0x0F);
 					else param = 0;
 				} else
 				if (param & 0x0F)
@@ -608,7 +608,7 @@
 				if(p->command == CMD_PANNING8)
 				{
 					Panning(pChn, p->param);
-				} else if((p->command == CMD_MODCMDEX) || (p->command == CMD_S3MCMDEX) && (p->param & 0xF0) == 0x80)
+				} else if(((p->command == CMD_MODCMDEX) || (p->command == CMD_S3MCMDEX)) && (p->param & 0xF0) == 0x80)
 				{
 					Panning(pChn, ((p->param & 0x0F) * 256 + 8) / 15);
 				} else if(p->command == VOLCMD_PANNING)

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