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

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

Revision: 617
          http://modplug.svn.sourceforge.net/modplug/?rev=617&view=rev
Author:   saga-games
Date:     2010-06-06 12:40:17 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
[Imp] Note Properties: Show the real finetune values for E5x in MOD/XM and E2x in S3M.
[Fix] The Pattern Loop command did not work properly for rows > 255.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2010-06-05 13:13:51 UTC (rev 616)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2010-06-06 12:40:17 UTC (rev 617)
@@ -16,6 +16,8 @@
 #include "modsmp_ctrl.h"
 #include "CleanupSong.h"
 
+extern WORD S3MFineTuneTable[16];
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -2118,7 +2120,7 @@
 	{CMD_MODCMDEX,		0xF0,0x20,	0,	MOD_TYPE_MODXM,	"Fine porta down"},
 	{CMD_MODCMDEX,		0xF0,0x30,	0,	MOD_TYPE_MODXM,	"Glissando Control"},
 	{CMD_MODCMDEX,		0xF0,0x40,	0,	MOD_TYPE_MODXM,	"Vibrato waveform"},
-	{CMD_MODCMDEX,		0xF0,0x50,	0,	MOD_TYPE_MOD,	"Set finetune"},
+	{CMD_MODCMDEX,		0xF0,0x50,	0,	MOD_TYPE_MODXM,	"Set finetune"},
 	{CMD_MODCMDEX,		0xF0,0x60,	0,	MOD_TYPE_MODXM,	"Pattern loop"},
 	{CMD_MODCMDEX,		0xF0,0x70,	0,	MOD_TYPE_MODXM,	"Tremolo waveform"},
 	{CMD_MODCMDEX,		0xF0,0x80,	0,	MOD_TYPE_MODXM,	"Set panning"},
@@ -2803,7 +2805,10 @@
 							strcpy(s, "smooth");
 						else
 							strcpy(s, "semitones");
-						break;					
+						break;
+					case 0x20: // set finetune
+						wsprintf(s, "%dHz", S3MFineTuneTable[param & 0x0F]);
+						break;
 					case 0x30: // vibrato waveform
 					case 0x40: // tremolo waveform
 					case 0x50: // panbrello waveform
@@ -2884,6 +2889,13 @@
 							case 0x07: case 0x0F: strcpy(s, "square wave (cont.)"); break;
 						}
 						break;
+					case 0x50: // set finetune
+						{
+							int8 nFinetune = (param & 0x0F) << 4;
+							if(m_SndFile.GetType() & MOD_TYPE_XM) nFinetune += 128;
+							wsprintf(s, "%d", nFinetune);
+						}
+						break;
 					case 0x60: // pattern loop
 						if((param & 0x0F) == 0x00)
 							strcpy(s, "loop start");

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2010-06-05 13:13:51 UTC (rev 616)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2010-06-06 12:40:17 UTC (rev 617)
@@ -223,7 +223,8 @@
 	BYTE nCutOff, nResonance;
 	int nRetrigCount, nRetrigParam;
 	BYTE nTremorCount, nTremorParam;
-	BYTE nPatternLoop, nPatternLoopCount;
+	ROWINDEX nPatternLoop;
+	BYTE nPatternLoopCount;
 	BYTE nRowNote, nRowInstr;
 	BYTE nRowVolCmd, nRowVolume;
 	BYTE nRowCommand, nRowParam;


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