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

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

Revision: 5394
          http://sourceforge.net/p/modplug/code/5394
Author:   saga-games
Date:     2015-07-07 23:42:03 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
[Fix] Previous commit just made preview even worse.
[Fix] Sample tab: Entering invalid loop point data went completely the opposite way as intended...

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/dlg_misc.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2015-07-07 22:11:49 UTC (rev 5393)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2015-07-07 23:42:03 UTC (rev 5394)
@@ -21,7 +21,7 @@
 #include "View_smp.h"
 #include "SampleEditorDialogs.h"
 #include "dlg_misc.h"
-#include "PSRatioCalc.h" //rewbs.timeStretchMods
+#include "PSRatioCalc.h"
 #include "soundtouch/include/SoundTouch.h"
 #include "soundtouch/source/SoundTouchDLL/SoundTouchDLL.h"
 #include "smbPitchShift/smbPitchShift.h"
@@ -2690,7 +2690,7 @@
 	if(IsLocked()) return;
 	ModSample &sample = m_sndFile.GetSample(m_nSample);
 	SmpLength start = GetDlgItemInt(IDC_EDIT1, NULL, FALSE), end = GetDlgItemInt(IDC_EDIT2, NULL, FALSE);
-	if(start < end || sample.uFlags[CHN_LOOP])
+	if(start < end || !sample.uFlags[CHN_LOOP])
 	{
 		const int n = m_ComboLoopType.GetCurSel();
 		sample.SetLoop(start, end, n > 0, n == 2, m_sndFile);

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2015-07-07 22:11:49 UTC (rev 5393)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2015-07-07 23:42:03 UTC (rev 5394)
@@ -291,7 +291,7 @@
 	// Temporarily apply new tempo signature for preview
 	ROWINDEX newRPB = std::max(1u, GetDlgItemInt(IDC_ROWSPERBEAT));
 	ROWINDEX newRPM = std::max(newRPB, GetDlgItemInt(IDC_ROWSPERMEASURE));
-	sndFile.m_nDefaultRowsPerBeat = newRPM;
+	sndFile.m_nDefaultRowsPerBeat = newRPB;
 	sndFile.m_nDefaultRowsPerMeasure = newRPM;
 	sndFile.m_nTempoMode = tempoModeModern;
 

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