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

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

Revision: 4722
          http://sourceforge.net/p/modplug/code/4722
Author:   saga-games
Date:     2015-01-18 01:28:06 +0000 (Sun, 18 Jan 2015)
Log Message:
-----------
[Fix] Maintain sample sync on seek was slightly broken since r4705.

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/4705

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-01-18 00:34:10 UTC (rev 4721)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-01-18 01:28:06 UTC (rev 4722)
@@ -704,7 +704,6 @@
 						if(forbiddenCommands[p->command])
 						{
 							stopNote = true;
-							break;
 						}
 						// Special case: Slides using extended commands
 						if(p->command == CMD_MODCMDEX)
@@ -716,7 +715,6 @@
 							case 0xA0:
 							case 0xB0:
 								stopNote = true;
-								break;
 							}
 						}
 					}
@@ -724,7 +722,6 @@
 					if(p->volcmd < MAX_VOLCMDS && forbiddenVolCommands[p->volcmd])
 					{
 						stopNote = true;
-						break;
 					}
 				}
 
@@ -1556,20 +1553,13 @@
 //---------------------------------------------------------------------------------------------------------------
 {
 	int32_t newPan = int32_min;
-	if(instr != nullptr)
-	{
-		// Default instrument panning
-		if(instr->dwFlags[INS_SETPANNING])
-		{
-			newPan = instr->nPan;
-		}
-	}
-
+	// Default instrument panning
+	if(instr != nullptr && instr->dwFlags[INS_SETPANNING])
+		newPan = instr->nPan;
 	// Default sample panning
 	if(smp != nullptr && smp->uFlags[CHN_PANNING])
-	{
 		newPan = smp->nPan;
-	}
+
 	if(newPan != int32_min)
 	{
 		pChn->nPan = newPan;

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