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

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

Revision: 3820
          http://sourceforge.net/p/modplug/code/3820
Author:   saga-games
Date:     2014-03-03 21:48:49 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
[Fix] Soundfont import: Loops were not pre-computed correctly.
[Fix] Sample sync on seek broke panning.

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

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-03-03 21:02:26 UTC (rev 3819)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-03-03 21:48:49 UTC (rev 3820)
@@ -1560,7 +1560,6 @@
 				SampleIO::littleEndian,
 				SampleIO::signedPCM)
 				.ReadSample(sample, chunk);
-			sample.PrecomputeLoops(sndFile, false);
 		}
 		bWaveForm = (sample.pSample) ? TRUE : FALSE;
 	} else
@@ -1654,6 +1653,7 @@
 		}
 		if (pDlsIns->szName[0]) memcpy(sndFile.m_szNames[nSample], pDlsIns->szName, MAX_SAMPLENAME - 1);
 		sample.Convert(MOD_TYPE_IT, sndFile.GetType());
+		sample.PrecomputeLoops(sndFile, false);
 		bOk = TRUE;
 	}
 	FreeWaveForm(pWaveForm);

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-03 21:02:26 UTC (rev 3819)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-03 21:48:49 UTC (rev 3820)
@@ -611,7 +611,7 @@
 				} 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)
+				} else if(p->volcmd == VOLCMD_PANNING)
 				{
 					pChn->nPan = p->vol * 4;
 				}

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