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

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

Revision: 1923
          http://sourceforge.net/p/modplug/code/1923
Author:   saga-games
Date:     2013-04-21 17:14:15 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
[Fix] Pattern Editor: Reverted playback cursor display behaviour to how it worked before OpenMPT 1.22
[Fix] FT2 Compatibility: Fixed Rxy a bit more (http://forum.openmpt.org/index.php?topic=4999.0)
[Mod] OpenMPT: Version is now 1.22.02.01

Modified Paths:
--------------
    trunk/OpenMPT/common/version.h
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h	2013-04-21 14:38:08 UTC (rev 1922)
+++ trunk/OpenMPT/common/version.h	2013-04-21 17:14:15 UTC (rev 1923)
@@ -21,7 +21,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					22
 #define VER_MINOR					02
-#define VER_MINORMINOR				00
+#define VER_MINORMINOR				01
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-04-21 14:38:08 UTC (rev 1922)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-04-21 17:14:15 UTC (rev 1923)
@@ -1637,7 +1637,7 @@
 	// Avoid global volume ramping when trying samples in the treeview.
 	m_WaveFile.m_nDefaultGlobalVolume = m_WaveFile.m_nGlobalVolume = MAX_GLOBAL_VOLUME;
 	m_WaveFile.SetMixLevels(mixLevels_117RC3);
-	m_WaveFile.m_nSamplePreAmp = m_WaveFile.GetPlayConfig().getNormalSamplePreAmp();
+	m_WaveFile.m_nSamplePreAmp = static_cast<uint32>(m_WaveFile.GetPlayConfig().getNormalSamplePreAmp());
 	m_WaveFile.m_nDefaultTempo = 125;
 	m_WaveFile.m_nDefaultSpeed = 6;
 	m_WaveFile.m_nType = MOD_TYPE_MPT;

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2013-04-21 14:38:08 UTC (rev 1922)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2013-04-21 17:14:15 UTC (rev 1923)
@@ -3570,6 +3570,11 @@
 		UpdateAllVUMeters(pnotify);
 	}
 
+	if(pnotify->type[Notification::Stop] && ((m_Status & (psFollowSong | psDragActive)) == psFollowSong))
+	{
+		SetPlayCursor(PATTERNINDEX_INVALID, ROWINDEX_INVALID);
+	}
+
 	UpdateIndicator();
 
 	return 0;

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-21 14:38:08 UTC (rev 1922)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-21 17:14:15 UTC (rev 1923)
@@ -127,10 +127,9 @@
 
 // Get mod length in various cases. Parameters:
 // [in]  adjustMode: See enmGetLengthResetMode for possible adjust modes.
-// [in]  endOrder: Order which should be reached (ORDERINDEX_INVALID means whole song)
-// [in]  endRow: Row in that order that should be reached
+// [in]  target: Time or position target which should be reached, or no target to get length of the first sub song.
 // [out] duration: total time in seconds
-// [out] targetReached: true if the specified order/row combination has been reached while going through the module.
+// [out] targetReached: true if the specified target has been reached while going through the module.
 // [out] lastOrder: last parsed order (if no target is specified, this is the first order that is parsed twice, i.e. not the *last* played order)
 // [out] lastRow: last parsed row (dito)
 // [out] endOrder: last order before module loops (UNDEFINED if a target is specified)
@@ -4109,7 +4108,7 @@
 	int nRetrigCount = chn.nRetrigCount;
 	bool bDoRetrig = false;
 
-	//IT compatibility 15. Retrigger
+	// IT compatibility 15. Retrigger
 	if(IsCompatibleMode(TRK_IMPULSETRACKER))
 	{
 		if(m_nTickCount == 0 && chn.rowCommand.note)
@@ -4123,13 +4122,13 @@
 		}
 	} else if(IsCompatibleMode(TRK_FASTTRACKER2) && (param & 0x100))
 	{
-		// buggy-like-hell FT2 Rxy retrig!
+		// Buggy-like-hell FT2 Rxy retrig!
 		if(m_SongFlags[SONG_FIRSTTICK])
 		{
-			// here are some really stupid things FT2 does
+			// Here are some really stupid things FT2 does.
 			if(chn.rowCommand.volcmd == VOLCMD_VOLUME) return;
 			if(chn.rowCommand.instr > 0 && chn.rowCommand.note == NOTE_NONE) nRetrigCount = 1;
-			if(chn.rowCommand.note != NOTE_NONE && chn.rowCommand.note <= GetModSpecifications().noteMax) nRetrigCount++;
+			if(chn.rowCommand.IsNote()) nRetrigCount = 1;
 		}
 		if (nRetrigCount >= nRetrigSpeed)
 		{

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