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

[<man...@us...>]

Revision: 1882
          http://sourceforge.net/p/modplug/code/1882
Author:   manxorist
Date:     2013-04-15 13:09:48 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
[Ref] Move locking out of CPattern.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/soundlib/pattern.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2013-04-15 12:52:49 UTC (rev 1881)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2013-04-15 13:09:48 UTC (rev 1882)
@@ -889,8 +889,10 @@
 	}
 
 	BeginWaitCursor();
+	CriticalSection cs;
 	GetPatternUndo().PrepareUndo(nPattern, 0, 0, GetNumChannels(), numRows);
 	bool success = m_SndFile.Patterns[nPattern].Expand();
+	cs.Leave();
 	EndWaitCursor();
 
 	if(success)
@@ -917,8 +919,10 @@
 	}
 
 	BeginWaitCursor();
+	CriticalSection cs;
 	GetPatternUndo().PrepareUndo(nPattern, 0, 0, GetNumChannels(), numRows);
 	bool success = m_SndFile.Patterns[nPattern].Shrink();
+	cs.Leave();
 	EndWaitCursor();
 
 	if(success)

Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp	2013-04-15 12:52:49 UTC (rev 1881)
+++ trunk/OpenMPT/soundlib/pattern.cpp	2013-04-15 13:09:48 UTC (rev 1882)
@@ -13,7 +13,6 @@
 #include "patternContainer.h"
 #include "../common/serialization_utils.h"
 #include "../common/version.h"
-#include "../common/AudioCriticalSection.h"
 #include "ITTools.h"
 #include "Sndfile.h"
 
@@ -86,7 +85,6 @@
 	// Copy over pattern data
 	memcpy(newPattern, m_ModCommands, GetNumChannels() * std::min(m_Rows, newRowCount) * sizeof(ModCommand));
 
-	CriticalSection cs;
 	FreePattern(m_ModCommands);
 	m_ModCommands = newPattern;
 	m_Rows = newRowCount;
@@ -156,7 +154,6 @@
 		memcpy(newPattern + y * 2 * nChns, m_ModCommands + y * nChns, nChns * sizeof(ModCommand));
 	}
 
-	CriticalSection cs;
 	FreePattern(m_ModCommands);
 	m_ModCommands = newPattern;
 	m_Rows = newRows;

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