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

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

Revision: 1001
          http://modplug.svn.sourceforge.net/modplug/?rev=1001&view=rev
Author:   saga-games
Date:     2011-08-25 21:22:28 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
[Mod] Loops are now automatically enabled when setting loop points in the sample editor

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_smp.cpp

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	2011-08-25 21:11:13 UTC (rev 1000)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	2011-08-25 21:22:28 UTC (rev 1001)
@@ -2380,13 +2380,9 @@
 		{
 			pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
 			pSmp->nLoopStart = m_dwMenuParam;
+			pSmp->uFlags |= CHN_LOOP;
 			pModDoc->SetModified();
-			if(pSmp->uFlags & CHN_LOOP)
-			{
-				/* only update sample buffer if the loop is actually enabled
-				(resets sound without any reason otherwise) - http://forum.openmpt.org/index.php?topic=1874.0 */
-				pModDoc->AdjustEndOfSample(m_nSample);
-			}
+			pModDoc->AdjustEndOfSample(m_nSample);
 			pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_SAMPLEDATA, NULL);
 		}
 	}
@@ -2405,13 +2401,9 @@
 		{
 			pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
 			pSmp->nLoopEnd = m_dwMenuParam;
+			pSmp->uFlags |= CHN_LOOP;
 			pModDoc->SetModified();
-			if(pSmp->uFlags & CHN_LOOP)
-			{
-				/* only update sample buffer if the loop is actually enabled
-				(resets sound without any reason otherwise) - http://forum.openmpt.org/index.php?topic=1874.0 */
-				pModDoc->AdjustEndOfSample(m_nSample);
-			}
+			pModDoc->AdjustEndOfSample(m_nSample);
 			pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_SAMPLEDATA, NULL);
 		}
 	}
@@ -2430,6 +2422,7 @@
 		{
 			pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
 			pSmp->nSustainStart = m_dwMenuParam;
+			pSmp->uFlags |= CHN_SUSTAINLOOP;
 			pModDoc->SetModified();
 			pModDoc->AdjustEndOfSample(m_nSample);
 			pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_SAMPLEDATA, NULL);
@@ -2450,6 +2443,7 @@
 		{
 			pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
 			pSmp->nSustainEnd = m_dwMenuParam;
+			pSmp->uFlags |= CHN_SUSTAINLOOP;
 			pModDoc->SetModified();
 			pModDoc->AdjustEndOfSample(m_nSample);
 			pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_SAMPLEDATA, NULL);

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