modplug-svn-commit Mailing List for modplug (Page 985)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 929
          http://modplug.svn.sourceforge.net/modplug/?rev=929&view=rev
Author:   saga-games
Date:     2011-07-26 19:04:08 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
Experimental new code...
[New] Adding / removing channels through the pattern editor now creates an undo point.
[Fix] Moving channels and then undoing the move preserves old channel settings (http://bugs.openmpt.org/view.php?id=156).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.h
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/mptrack/Undo.cpp
    trunk/OpenMPT/mptrack/Undo.h

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================

--- trunk/OpenMPT/mptrack/Moddoc.h	2011-07-26 00:22:44 UTC (rev 928)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2011-07-26 19:04:08 UTC (rev 929)
@@ -277,9 +277,9 @@
 	bool ChangeModType(MODTYPE wType);
 
 	bool ChangeNumChannels(CHANNELINDEX nNewChannels, const bool showCancelInRemoveDlg = true);
-	CHANNELINDEX ReArrangeChannels(const vector<CHANNELINDEX> &fromToArray);
+	bool RemoveChannels(const vector<bool> &keepMask);
+	CHANNELINDEX ReArrangeChannels(const vector<CHANNELINDEX> &fromToArray, const bool createUndoPoint = true);
 	bool MoveChannel(CHANNELINDEX chn_from, CHANNELINDEX chn_to);
-	bool RemoveChannels(const vector<bool> &keepMask);
 	void CheckUsedChannels(vector<bool> &usedMask, CHANNELINDEX maxRemoveCount = MAX_BASECHANNELS) const;
 
 	bool ConvertInstrumentsToSamples();

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2011-07-26 00:22:44 UTC (rev 928)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2011-07-26 19:04:08 UTC (rev 929)
@@ -138,8 +138,8 @@
 
 // Base code for adding, removing, moving and duplicating channels. Returns new number of channels on success, CHANNELINDEX_INVALID otherwise.
 // The new channel vector can contain CHANNELINDEX_INVALID for adding new (empty) channels.
-CHANNELINDEX CModDoc::ReArrangeChannels(const vector<CHANNELINDEX> &newOrder)
-//---------------------------------------------------------------------------
+CHANNELINDEX CModDoc::ReArrangeChannels(const vector<CHANNELINDEX> &newOrder, const bool createUndoPoint)
+//-------------------------------------------------------------------------------------------------------
 {
 	//newOrder[i] tells which current channel should be placed to i:th position in
 	//the new order, or if i is not an index of current channels, then new channel is
@@ -157,20 +157,25 @@
 	}
 
 	bool first = true;
-	if(nRemainingChannels != GetNumChannels())
+	// Find highest valid pattern number for storing channel undo data with, since the pattern with the highest number will be undone first.
+	PATTERNINDEX highestPattern = 0;
+	for(PATTERNINDEX nPat = m_SndFile.Patterns.Size() - 1; nPat > 0; nPat--)
 	{
-		// For now, changing number of channels can't be undone
-		GetPatternUndo()->ClearUndo();
+		if(m_SndFile.Patterns.IsValidPat(nPat))
+		{
+			highestPattern = nPat;
+			break;
+		}
 	}
 
 	BEGIN_CRITICAL();
-	for(PATTERNINDEX nPat = 0; nPat < m_SndFile.Patterns.Size(); nPat++) 
+	for(PATTERNINDEX nPat = 0; nPat <= highestPattern; nPat++) 
 	{
-		if(m_SndFile.Patterns[nPat])
+		if(m_SndFile.Patterns.IsValidPat(nPat))
 		{
-			if(nRemainingChannels == GetNumChannels())
+			if(createUndoPoint)
 			{
-				GetPatternUndo()->PrepareUndo(nPat, 0, 0, GetNumChannels(), m_SndFile.Patterns[nPat].GetNumRows(), !first);
+				GetPatternUndo()->PrepareUndo(nPat, 0, 0, GetNumChannels(), m_SndFile.Patterns[nPat].GetNumRows(), !first, (nPat == highestPattern));
 				first = false;
 			}
 
@@ -795,9 +800,9 @@
 						case NOTE_NONE:		p[1] = p[2] = p[3] = '.'; break;
 						case NOTE_KEYOFF:	p[1] = p[2] = p[3] = '='; break;
 						case NOTE_NOTECUT:	p[1] = p[2] = p[3] = '^'; break;
-						case NOTE_FADE:	p[1] = p[2] = p[3] = '~'; break;
-						case NOTE_PC: p[1] = 'P'; p[2] = 'C'; p[3] = ' '; break;
-						case NOTE_PCS: p[1] = 'P'; p[2] = 'C'; p[3] = 'S'; break;
+						case NOTE_FADE:		p[1] = p[2] = p[3] = '~'; break;
+						case NOTE_PC:		p[1] = 'P'; p[2] = 'C'; p[3] = ' '; break;
+						case NOTE_PCS:		p[1] = 'P'; p[2] = 'C'; p[3] = 'S'; break;
 						default:
 							p[1] = szNoteNames[(note-1) % 12][0];
 							p[2] = szNoteNames[(note-1) % 12][1];

Modified: trunk/OpenMPT/mptrack/Undo.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Undo.cpp	2011-07-26 00:22:44 UTC (rev 928)
+++ trunk/OpenMPT/mptrack/Undo.cpp	2011-07-26 19:04:08 UTC (rev 929)
@@ -39,8 +39,9 @@
 //   - numChns: width
 //   - numRows: height
 //   - linkToPrevious: Don't create a separate undo step, but link this to the previous undo event. Useful for commands that modify several patterns at once.
-bool CPatternUndo::PrepareUndo(PATTERNINDEX pattern, CHANNELINDEX firstChn, ROWINDEX firstRow, CHANNELINDEX numChns, ROWINDEX numRows, bool linkToPrevious)
-//---------------------------------------------------------------------------------------------------------------------------------------------------------
+//   - storeChannelInfo: Also store current channel header information (pan / volume / etc. settings) and number of channels in this undo point.
+bool CPatternUndo::PrepareUndo(PATTERNINDEX pattern, CHANNELINDEX firstChn, ROWINDEX firstRow, CHANNELINDEX numChns, ROWINDEX numRows, bool linkToPrevious, bool storeChannelInfo)
+//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 {
 	if(m_pModDoc == nullptr) return false;
 	CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
@@ -84,6 +85,17 @@
 		pPattern += pSndFile->GetNumChannels();
 	}
 
+	if(storeChannelInfo)
+	{
+		sUndo.channelInfo = new PATTERNUNDOINFO;
+		sUndo.channelInfo->oldNumChannels = pSndFile->GetNumChannels();
+		sUndo.channelInfo->settings = new MODCHANNELSETTINGS[pSndFile->GetNumChannels()];
+		memcpy(sUndo.channelInfo->settings, pSndFile->ChnSettings, sizeof(MODCHANNELSETTINGS) * pSndFile->GetNumChannels());
+	} else
+	{
+		sUndo.channelInfo = nullptr;
+	}
+
 	UndoBuffer.push_back(sUndo);
 
 	if (bUpdate) m_pModDoc->UpdateAllViews(NULL, HINT_UNDO);
@@ -127,6 +139,30 @@
 	// Select most recent undo slot
 	const PATTERNUNDOBUFFER *pUndo = &UndoBuffer.back();
 
+	if(pUndo->channelInfo != nullptr)
+	{
+		if(pUndo->channelInfo->oldNumChannels > pSndFile->GetNumChannels())
+		{
+			// First add some channels again...
+			vector<CHANNELINDEX> channels(pUndo->channelInfo->oldNumChannels, CHANNELINDEX_INVALID);
+			for(CHANNELINDEX i = 0; i < pSndFile->GetNumChannels(); i++)
+			{
+				channels[i] = i;
+			}
+			m_pModDoc->ReArrangeChannels(channels, false);
+		} else if(pUndo->channelInfo->oldNumChannels < pSndFile->GetNumChannels())
+		{
+			// ... or remove newly added channels
+			vector<CHANNELINDEX> channels(pUndo->channelInfo->oldNumChannels);
+			for(CHANNELINDEX i = 0; i < pUndo->channelInfo->oldNumChannels; i++)
+			{
+				channels[i] = i;
+			}
+			m_pModDoc->ReArrangeChannels(channels, false);
+		}
+		memcpy(pSndFile->ChnSettings, pUndo->channelInfo->settings, sizeof(MODCHANNELSETTINGS) * pUndo->channelInfo->oldNumChannels);
+	}
+
 	nPattern = pUndo->pattern;
 	nRows = pUndo->patternsize;
 	if(pUndo->firstChannel + pUndo->numChannels <= pSndFile->GetNumChannels())
@@ -159,14 +195,14 @@
 
 	RemoveLastUndoStep();
 
-	if (CanUndo() == false) m_pModDoc->UpdateAllViews(NULL, HINT_UNDO);
+	if(CanUndo() == false) m_pModDoc->UpdateAllViews(NULL, HINT_UNDO);
+
 	if(linkToPrevious)
 	{
-		return Undo(true);		
-	} else
-	{
-		return nPattern;
+		nPattern = Undo(true);		
 	}
+
+	return nPattern;
 }
 
 
@@ -183,7 +219,12 @@
 //-------------------------------------------
 {
 	if(nStep >= UndoBuffer.size()) return;
-	if (UndoBuffer[nStep].pbuffer) delete[] UndoBuffer[nStep].pbuffer;
+	if(UndoBuffer[nStep].pbuffer) delete[] UndoBuffer[nStep].pbuffer;
+	if(UndoBuffer[nStep].channelInfo)
+	{
+		delete[] UndoBuffer[nStep].channelInfo->settings;
+		delete UndoBuffer[nStep].channelInfo;
+	}
 	UndoBuffer.erase(UndoBuffer.begin() + nStep);
 }
 

Modified: trunk/OpenMPT/mptrack/Undo.h
===================================================================
--- trunk/OpenMPT/mptrack/Undo.h	2011-07-26 00:22:44 UTC (rev 928)
+++ trunk/OpenMPT/mptrack/Undo.h	2011-07-26 19:04:08 UTC (rev 929)
@@ -14,6 +14,13 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 // Pattern Undo
 
+// Additional undo information, as required
+struct PATTERNUNDOINFO
+{
+	MODCHANNELSETTINGS *settings;
+	CHANNELINDEX oldNumChannels;
+};
+
 struct PATTERNUNDOBUFFER
 {
 	PATTERNINDEX pattern;
@@ -21,6 +28,7 @@
 	CHANNELINDEX firstChannel, numChannels;
 	ROWINDEX firstRow, numRows;
 	MODCOMMAND *pbuffer;
+	PATTERNUNDOINFO *channelInfo;
 	bool linkToPrevious;
 };
 
@@ -29,7 +37,7 @@
 //================
 {
 
-private:
+protected:
 
 	std::vector<PATTERNUNDOBUFFER> UndoBuffer;
 	CModDoc *m_pModDoc;
@@ -42,7 +50,7 @@
 
 	// Pattern undo functions
 	void ClearUndo();
-	bool PrepareUndo(PATTERNINDEX pattern, CHANNELINDEX firstChn, ROWINDEX firstRow, CHANNELINDEX numChns, ROWINDEX numRows, bool linkToPrevious = false);
+	bool PrepareUndo(PATTERNINDEX pattern, CHANNELINDEX firstChn, ROWINDEX firstRow, CHANNELINDEX numChns, ROWINDEX numRows, bool linkToPrevious = false, bool storeChannelInfo = false);
 	PATTERNINDEX Undo();
 	bool CanUndo();
 	void RemoveLastUndoStep();
@@ -93,7 +101,7 @@
 //===============
 {
 
-private:
+protected:
 
 	// Undo buffer
 	std::vector<std::vector<SAMPLEUNDOBUFFER> > UndoBuffer;


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




2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (203)	Sep (148)	Oct (109)	Nov (191)	Dec (209)
2026	Jan (127)	Feb (123)	Mar (160)	Apr (141)	May (48)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

modplug-svn-commit Mailing List for modplug (Page 985)

A music tracker software for Windows.

modplug-svn-commit — OpenMPT subversion commit notifications