Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1119] trunk/OpenMPT
|
From: <sag...@us...> - 2011-10-23 00:16:21
|
Revision: 1119
http://modplug.svn.sourceforge.net/modplug/?rev=1119&view=rev
Author: saga-games
Date: 2011-10-23 00:16:13 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
[Ref] References > Pointers.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/EffectVis.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/ModConvert.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/test/test.cpp
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/pattern.cpp
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -500,7 +500,7 @@
EndWaitCursor();
if ((nPatRemoved) || (bReordered))
{
- m_pModDoc->GetPatternUndo()->ClearUndo();
+ m_pModDoc->GetPatternUndo().ClearUndo();
if (nPatRemoved)
{
wsprintf(s, "%d pattern%s removed.\n", nPatRemoved, (nPatRemoved == 1) ? "" : "s");
@@ -528,7 +528,7 @@
if (!pSndFile->IsSampleUsed(nSmp))
{
samplesUsed[nSmp] = false;
- m_pModDoc->GetSampleUndo()->PrepareUndo(nSmp, sundo_delete);
+ m_pModDoc->GetSampleUndo().PrepareUndo(nSmp, sundo_delete);
}
}
@@ -553,11 +553,11 @@
{
if ((!samplesUsed[nSmp]) && (pSndFile->GetSample(nSmp).pSample))
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(nSmp, sundo_delete);
+ m_pModDoc->GetSampleUndo().PrepareUndo(nSmp, sundo_delete);
pSndFile->DestroySample(nSmp);
if ((nSmp == pSndFile->m_nSamples) && (nSmp > 1)) pSndFile->m_nSamples--;
nRemoved++;
- m_pModDoc->GetSampleUndo()->ClearUndo(nSmp);
+ m_pModDoc->GetSampleUndo().ClearUndo(nSmp);
}
}
wsprintf(s, "%d unused sample%s removed\n" , nRemoved, (nRemoved == 1) ? "" : "s");
@@ -622,7 +622,7 @@
UINT lmax = loopLength + 2;
if ((lmax < sample.nLength) && (lmax >= 2))
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(nSmp, sundo_delete, lmax, sample.nLength);
+ m_pModDoc->GetSampleUndo().PrepareUndo(nSmp, sundo_delete, lmax, sample.nLength);
ctrlSmp::ResizeSample(sample, lmax, pSndFile);
}
}
@@ -707,7 +707,7 @@
}
// Too lazy to fix sample undo...
- m_pModDoc->GetSampleUndo()->ClearUndo();
+ m_pModDoc->GetSampleUndo().ClearUndo();
pSndFile->m_nSamples -= nRemap;
@@ -987,7 +987,7 @@
for (SAMPLEINDEX nSmp = 1; nSmp <= pSndFile->GetNumSamples(); nSmp++)
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(nSmp, sundo_delete, 0, pSndFile->GetSample(nSmp).nLength);
+ m_pModDoc->GetSampleUndo().PrepareUndo(nSmp, sundo_delete, 0, pSndFile->GetSample(nSmp).nLength);
}
ctrlSmp::ResetSamples(*pSndFile, ctrlSmp::SmpResetInit);
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -343,7 +343,7 @@
}
if (dwHintMask & (HINT_MODTYPE|HINT_UNDO))
{
- m_ToolBar.EnableButton(ID_EDIT_UNDO, m_pModDoc->GetPatternUndo()->CanUndo());
+ m_ToolBar.EnableButton(ID_EDIT_UNDO, m_pModDoc->GetPatternUndo().CanUndo());
}
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -752,7 +752,7 @@
{
CriticalSection cs;
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
bOk = m_pSndFile->ReadSampleFromFile(m_nSample, lpFile, len);
}
@@ -813,12 +813,12 @@
if (!sample.nC5Speed) sample.nC5Speed = 22050;
} else
{
- m_pModDoc->GetSampleUndo()->Undo(m_nSample);
+ m_pModDoc->GetSampleUndo().Undo(m_nSample);
}
} else
{
- m_pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ m_pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
}
f.Unlock();
@@ -873,7 +873,7 @@
CriticalSection cs;
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
m_pSndFile->DestroySample(m_nSample);
m_pSndFile->ReadSampleFromSong(m_nSample, pSndFile, nSample);
MODSAMPLE &sample = m_pSndFile->GetSample(m_nSample);
@@ -947,7 +947,7 @@
if(bDuplicate && nOldSmp >= 1 && nOldSmp <= pSndFile->GetNumSamples())
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(smp, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(smp, sundo_replace);
MemCopy(m_pSndFile->GetSample(smp), m_pSndFile->GetSample(nOldSmp));
strcpy(m_pSndFile->m_szNames[smp], m_pSndFile->m_szNames[nOldSmp]);
// Clone sample.
@@ -1194,7 +1194,7 @@
}
}
- m_pModDoc->GetSampleUndo()->PrepareUndo(iSmp, sundo_update, iStart, iEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(iSmp, sundo_update, iStart, iEnd);
if (sample.uFlags & CHN_STEREO) { iStart *= 2; iEnd *= 2; }
@@ -1265,7 +1265,7 @@
SELECTIONPOINTS selection = GetSelectionPoints();
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_update, selection.nStart, selection.nEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_update, selection.nStart, selection.nEnd);
if (sample.uFlags & CHN_STEREO) { selection.nStart *= 2; selection.nEnd *= 2; }
UINT len = selection.nEnd - selection.nStart;
@@ -1347,7 +1347,7 @@
iEnd = selection.nEnd;
}
- m_pModDoc->GetSampleUndo()->PrepareUndo(iSmp, sundo_update, iStart, iEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(iSmp, sundo_update, iStart, iEnd);
const float fOffset = ctrlSmp::RemoveDCOffset(m_pSndFile->GetSample(iSmp), iStart, iEnd, m_pSndFile->GetType(), m_pSndFile);
@@ -1455,7 +1455,7 @@
if (dwNewLen+4 <= MAX_SAMPLE_LENGTH) pNewSample = CSoundFile::AllocateSample((dwNewLen+4)*newsmplsize);
if (pNewSample)
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
const UINT nCh = sample.GetNumChannels();
for (UINT iCh=0; iCh<nCh; iCh++)
@@ -1608,7 +1608,7 @@
if (pNewSample)
{
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
const UINT nCh = sample.GetNumChannels();
for (UINT iCh=0; iCh<nCh; iCh++)
@@ -2040,7 +2040,7 @@
ASSERT(nNewSampleLength >= nLengthCounter);
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
// Swap sample buffer pointer to new buffer, update song + sample data & free old sample buffer
ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, min(nLengthCounter, nNewSampleLength), m_pSndFile);
@@ -2121,7 +2121,7 @@
float * buffer = new float[MAX_BUFFER_LENGTH + fft];
float * outbuf = new float[MAX_BUFFER_LENGTH + fft];
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
// Process each channel separately
for(UINT i = 0 ; i < nChn ; i++){
@@ -2240,14 +2240,14 @@
SELECTIONPOINTS selection = GetSelectionPoints();
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_reverse, selection.nStart, selection.nEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_reverse, selection.nStart, selection.nEnd);
if(ctrlSmp::ReverseSample(sample, selection.nStart, selection.nEnd, m_pSndFile) == true)
{
m_pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEDATA, NULL);
m_pModDoc->SetModified();
} else
{
- m_pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ m_pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
EndWaitCursor();
SwitchToView();
@@ -2261,14 +2261,14 @@
SELECTIONPOINTS selection = GetSelectionPoints();
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_invert, selection.nStart, selection.nEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_invert, selection.nStart, selection.nEnd);
if(ctrlSmp::InvertSample(sample, selection.nStart, selection.nEnd, m_pSndFile) == true)
{
m_pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEDATA, NULL);
m_pModDoc->SetModified();
} else
{
- m_pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ m_pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
EndWaitCursor();
SwitchToView();
@@ -2287,14 +2287,14 @@
MODSAMPLE &sample = m_pSndFile->GetSample(m_nSample);
SELECTIONPOINTS selection = GetSelectionPoints();
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_unsign, selection.nStart, selection.nEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_unsign, selection.nStart, selection.nEnd);
if(ctrlSmp::UnsignSample(sample, selection.nStart, selection.nEnd, m_pSndFile) == true)
{
m_pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEDATA, NULL);
m_pModDoc->SetModified();
} else
{
- m_pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ m_pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
EndWaitCursor();
SwitchToView();
@@ -2312,7 +2312,7 @@
if(selection.bSelected == true)
{
MODSAMPLE &sample = m_pSndFile->GetSample(m_nSample);
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_update, selection.nStart, selection.nEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_update, selection.nStart, selection.nEnd);
int len = selection.nEnd - selection.nStart;
if (sample.uFlags & CHN_STEREO)
@@ -3182,7 +3182,7 @@
if(nFadeLength < 4) return;
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_update, sample.nLoopEnd - nFadeLength, sample.nLoopEnd);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_update, sample.nLoopEnd - nFadeLength, sample.nLoopEnd);
// If we want to fade nFadeLength bytes, we need as much sample material before the loop point. nFadeLength has been adjusted above.
if(sample.nLoopStart < nFadeLength)
{
@@ -3195,7 +3195,7 @@
m_pModDoc->SetModified();
} else
{
- m_pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ m_pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
}
@@ -3218,7 +3218,7 @@
if(dlg.DoModal() == IDOK)
{
BeginWaitCursor();
- m_pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
+ m_pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_none);
at.Apply(static_cast<double>(dlg.GetPitchReference()), dlg.GetTargetNote());
m_pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO, NULL);
m_pModDoc->SetModified();
Modified: trunk/OpenMPT/mptrack/EffectVis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectVis.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/EffectVis.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -650,7 +650,7 @@
rect.SetRect(x-NODEHALF, y-NODEHALF, x+NODEHALF+1, y+NODEHALF+1);
if (rect.PtInRect(point))
{
- m_pModDoc->GetPatternUndo()->PrepareUndo(static_cast<PATTERNINDEX>(m_nPattern), m_nChan, row, m_nChan+1, row+1);
+ m_pModDoc->GetPatternUndo().PrepareUndo(static_cast<PATTERNINDEX>(m_nPattern), m_nChan, row, m_nChan+1, row+1);
m_nDragItem = row;
}
}
@@ -748,7 +748,7 @@
SetFocus();
SetCapture();
- m_pModDoc->GetPatternUndo()->PrepareUndo(static_cast<PATTERNINDEX>(m_nPattern), m_nChan, m_startRow, m_nChan+1, m_endRow);
+ m_pModDoc->GetPatternUndo().PrepareUndo(static_cast<PATTERNINDEX>(m_nPattern), m_nChan, m_startRow, m_nChan+1, m_endRow);
m_dwStatus |= FXVSTATUS_LDRAGGING;
}
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -2178,7 +2178,7 @@
if (bTemplateFile)
{
- pModDoc->GetFileHistory()->clear(); // Reset edit history for template files
+ pModDoc->GetFileHistory().clear(); // Reset edit history for template files
pModDoc->GetSoundFile()->m_dwCreatedWithVersion = MptVersion::num;
pModDoc->GetSoundFile()->m_dwLastSavedWithVersion = 0;
}
Modified: trunk/OpenMPT/mptrack/ModConvert.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ModConvert.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/ModConvert.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -479,7 +479,7 @@
}
// Check whether the new format supports embedding the edit history in the file.
- if(oldTypeIsIT_MPT && !newTypeIsIT_MPT && GetFileHistory()->size() > 0)
+ if(oldTypeIsIT_MPT && !newTypeIsIT_MPT && GetFileHistory().size() > 0)
{
CHANGEMODTYPE_WARNING(wEditHistory);
}
@@ -571,8 +571,8 @@
CHANGEMODTYPE_CHECK(wCompatibilityMode, "Consider enabling the \"compatible playback\" option in the song properties to increase compatiblity with other players.\n");
SetModified();
- GetPatternUndo()->ClearUndo();
- GetSampleUndo()->ClearUndo();
+ GetPatternUndo().ClearUndo();
+ GetSampleUndo().ClearUndo();
UpdateAllViews(NULL, HINT_MODTYPE | HINT_MODGENERAL);
EndWaitCursor();
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -124,12 +124,6 @@
m_PatternUndo.SetParent(this);
m_SampleUndo.SetParent(this);
- m_SplitKeyboardSettings.splitInstrument = 0;
- m_SplitKeyboardSettings.splitNote = NOTE_MIDDLEC - 1;
- m_SplitKeyboardSettings.splitVolume = 0;
- m_SplitKeyboardSettings.octaveModifier = 0;
- m_SplitKeyboardSettings.octaveLink = false;
-
// Set the creation date of this file (or the load time if we're loading an existing file)
time(&m_creationTime);
m_FileHistory.clear();
Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/Moddoc.h 2011-10-23 00:16:13 UTC (rev 1119)
@@ -160,6 +160,16 @@
MODCOMMAND::VOL splitVolume;
int octaveModifier; // determines by how many octaves the notes should be transposed up or down
bool octaveLink; // apply octaveModifier
+
+ SplitKeyboardSettings()
+ //---------------------
+ {
+ splitInstrument = 0;
+ splitNote = NOTE_MIDDLEC - 1;
+ splitVolume = 0;
+ octaveModifier = 0;
+ octaveLink = false;
+ }
};
enum LogEventType
@@ -267,12 +277,12 @@
void SongProperties();
- CPatternUndo *GetPatternUndo() { return &m_PatternUndo; }
- CSampleUndo *GetSampleUndo() { return &m_SampleUndo; }
+ CPatternUndo &GetPatternUndo() { return m_PatternUndo; }
+ CSampleUndo &GetSampleUndo() { return m_SampleUndo; }
SplitKeyboardSettings &GetSplitKeyboardSettings() { return m_SplitKeyboardSettings; }
- vector<FileHistory> *GetFileHistory() { return &m_FileHistory; }
- const vector<FileHistory> *GetFileHistory() const { return &m_FileHistory; }
+ vector<FileHistory> &GetFileHistory() { return m_FileHistory; }
+ const vector<FileHistory> &GetFileHistory() const { return m_FileHistory; }
time_t GetCreationTime() const { return m_creationTime; }
// operations
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -181,7 +181,7 @@
{
if(createUndoPoint)
{
- GetPatternUndo()->PrepareUndo(nPat, 0, 0, GetNumChannels(), m_SndFile.Patterns[nPat].GetNumRows(), !first, (nPat == highestPattern));
+ GetPatternUndo().PrepareUndo(nPat, 0, 0, GetNumChannels(), m_SndFile.Patterns[nPat].GetNumRows(), !first, (nPat == highestPattern));
first = false;
}
@@ -1031,7 +1031,7 @@
// Before changing anything in this pattern, we have to create an undo point.
if(bPrepareUndo)
{
- GetPatternUndo()->PrepareUndo(nPattern, 0, 0, m_SndFile.m_nChannels, m_SndFile.Patterns[nPattern].GetNumRows(), !bFirstUndo);
+ GetPatternUndo().PrepareUndo(nPattern, 0, 0, m_SndFile.m_nChannels, m_SndFile.Patterns[nPattern].GetNumRows(), !bFirstUndo);
bPrepareUndo = false;
bFirstUndo = false;
}
Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -727,7 +727,7 @@
{
if(!m_bModified) // let's create just one undo step.
{
- m_pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
+ m_pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
m_bModified = true;
}
m->note = note;
@@ -756,7 +756,7 @@
{
if(!m_bModified) // let's create just one undo step.
{
- m_pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
+ m_pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
m_bModified = true;
}
m->volcmd = volcmd;
@@ -796,7 +796,7 @@
{
if(!m_bModified) // let's create just one undo step.
{
- m_pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
+ m_pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, m_nChannel, m_nRow, 1, 1);
m_bModified = true;
}
m->command = command;
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -626,7 +626,7 @@
const ROWINDEX nRowBeg = GetRowFromCursor(dwBegin), nRowEnd = GetRowFromCursor(dwEnd);
if((nChnEnd < nChnBeg) || (nRowEnd < nRowBeg) || pModDoc == nullptr) return false;
- return pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, nChnBeg, nRowBeg, nChnEnd-nChnBeg+1, nRowEnd-nRowBeg+1);
+ return pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, nChnBeg, nRowBeg, nChnEnd-nChnBeg+1, nRowEnd-nRowBeg+1);
}
@@ -768,7 +768,7 @@
const DWORD startSel = (GetRowFromCursor(m_dwBeginSel) < GetRowFromCursor(m_dwEndSel)) ? m_dwBeginSel : m_dwEndSel;
const DWORD endSel = (GetRowFromCursor(m_dwBeginSel) < GetRowFromCursor(m_dwEndSel)) ? m_dwEndSel : m_dwBeginSel;
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0, 0, pSndFile->GetNumChannels(), pSndFile->Patterns[m_nPattern].GetNumRows());
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0, 0, pSndFile->GetNumChannels(), pSndFile->Patterns[m_nPattern].GetNumRows());
const ROWINDEX finalDest = GetRowFromCursor(startSel) + (GetRowFromCursor(endSel) - GetRowFromCursor(startSel))*2;
for (int row = finalDest; row > (int)GetRowFromCursor(startSel); row -= 2)
@@ -818,7 +818,7 @@
const DWORD startSel = (GetRowFromCursor(m_dwBeginSel) < GetRowFromCursor(m_dwEndSel)) ? m_dwBeginSel : m_dwEndSel;
const DWORD endSel = (GetRowFromCursor(m_dwBeginSel) < GetRowFromCursor(m_dwEndSel)) ? m_dwEndSel : m_dwBeginSel;
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0, 0, pSndFile->GetNumChannels(), pSndFile->Patterns[m_nPattern].GetNumRows());
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0, 0, pSndFile->GetNumChannels(), pSndFile->Patterns[m_nPattern].GetNumRows());
const ROWINDEX finalDest = GetRowFromCursor(startSel) + (GetRowFromCursor(endSel) - GetRowFromCursor(startSel))/2;
@@ -1686,7 +1686,7 @@
maxrow = pSndFile->Patterns[m_nPattern].GetNumRows();
if (colmax >= pSndFile->m_nChannels) colmax = pSndFile->m_nChannels-1;
if (colmin > colmax) return;
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0,0, pSndFile->m_nChannels, maxrow);
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0,0, pSndFile->m_nChannels, maxrow);
for (UINT r=row; r<maxrow; r++)
{
MODCOMMAND *m = pSndFile->Patterns[m_nPattern].GetpModCommand(r, colmin);
@@ -1750,7 +1750,7 @@
maxrow = pSndFile->Patterns[m_nPattern].GetNumRows();
if (colmax >= pSndFile->GetNumChannels()) colmax = pSndFile->GetNumChannels() - 1;
if (colmin > colmax) return;
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0,0, pSndFile->GetNumChannels(), maxrow);
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0,0, pSndFile->GetNumChannels(), maxrow);
for (UINT r=maxrow; r>row; )
{
@@ -2044,7 +2044,7 @@
{
// Just create one logic undo step when auto-replacing all occurences.
const bool linkUndoBuffer = (nFound > 1) && (m_findReplace.dwReplaceFlags & PATSEARCH_REPLACEALL) != 0;
- pModDoc->GetPatternUndo()->PrepareUndo(nPat, n % pSndFile->GetNumChannels(), n / pSndFile->GetNumChannels(), 1, 1, linkUndoBuffer);
+ pModDoc->GetPatternUndo().PrepareUndo(nPat, n % pSndFile->GetNumChannels(), n / pSndFile->GetNumChannels(), 1, 1, linkUndoBuffer);
if ((m_findReplace.dwReplaceFlags & PATSEARCH_NOTE))
{
@@ -2643,7 +2643,7 @@
dx = (int)GetChanFromCursor(m_dwDragPos) - (int)GetChanFromCursor(m_dwStartSel);
dy = (int)GetRowFromCursor(m_dwDragPos) - (int)GetRowFromCursor(m_dwStartSel);
if ((!dx) && (!dy)) return;
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0,0, nChannels, nRows);
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0,0, nChannels, nRows);
pNewPattern = CPattern::AllocatePattern(nRows, nChannels);
if (!pNewPattern) return;
x1 = GetChanFromCursor(m_dwBeginSel);
@@ -2899,7 +2899,7 @@
CModDoc *pModDoc = GetDocument();
if ((pCmdUI) && (pModDoc))
{
- pCmdUI->Enable(pModDoc->GetPatternUndo()->CanUndo());
+ pCmdUI->Enable(pModDoc->GetPatternUndo().CanUndo());
}
}
@@ -2910,7 +2910,7 @@
CModDoc *pModDoc = GetDocument();
if (pModDoc && IsEditingEnabled_bmsg())
{
- PATTERNINDEX nPat = pModDoc->GetPatternUndo()->Undo();
+ PATTERNINDEX nPat = pModDoc->GetPatternUndo().Undo();
if (nPat < pModDoc->GetSoundFile()->Patterns.Size())
{
pModDoc->SetModified();
@@ -3238,7 +3238,7 @@
// only overwrite existing PC Notes
if(pRow->IsEmpty() || pRow->IsPcNote())
{
- pModDoc->GetPatternUndo()->PrepareUndo(nPattern, nChn, nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(nPattern, nChn, nRow, 1, 1);
pRow->Set(NOTE_PCS, plugSlot + 1, paramIndex, static_cast<uint16>(pPlug->GetParameter(paramIndex) * MODCOMMAND::maxColumnValue));
InvalidateRow(nRow);
@@ -3265,7 +3265,7 @@
pSndFile->Chn[nChn].nActiveMacro = foundMacro;
if (pRow->command == CMD_NONE || pRow->command == CMD_SMOOTHMIDI || pRow->command == CMD_MIDI) //we overwrite existing Zxx and \xx only.
{
- pModDoc->GetPatternUndo()->PrepareUndo(nPattern, nChn, nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(nPattern, nChn, nRow, 1, 1);
pRow->command = (pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) ? CMD_S3MCMDEX : CMD_MODCMDEX;;
pRow->param = 0xF0 + (foundMacro&0x0F);
@@ -3278,7 +3278,7 @@
//Write the data, but we only overwrite if the command is a macro anyway.
if (pRow->command == CMD_NONE || pRow->command == CMD_SMOOTHMIDI || pRow->command == CMD_MIDI)
{
- pModDoc->GetPatternUndo()->PrepareUndo(nPattern, nChn, nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(nPattern, nChn, nRow, 1, 1);
pRow->command = CMD_SMOOTHMIDI;
pRow->param = pPlug->GetZxxParameter(paramIndex);
@@ -3369,7 +3369,7 @@
const bool bLiveRecord = IsLiveRecord(*pModDoc, *pSndFile);
ModCommandPos editpos = GetEditPos(*pSndFile, bLiveRecord);
MODCOMMAND* p = GetModCommand(*pSndFile, editpos);
- pModDoc->GetPatternUndo()->PrepareUndo(editpos.nPat, editpos.nChn, editpos.nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(editpos.nPat, editpos.nChn, editpos.nRow, 1, 1);
p->Set(NOTE_PCS, mappedIndex, static_cast<uint16>(paramIndex), static_cast<uint16>((paramValue * MODCOMMAND::maxColumnValue)/127));
if(bLiveRecord == false)
InvalidateRow(editpos.nRow);
@@ -3421,7 +3421,7 @@
MODCOMMAND* p = GetModCommand(*pSndFile, editpos);
if(p->command == CMD_NONE || p->command == CMD_SMOOTHMIDI || p->command == CMD_MIDI)
{ // Write command only if there's no existing command or already a midi macro command.
- pModDoc->GetPatternUndo()->PrepareUndo(editpos.nPat, editpos.nChn, editpos.nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(editpos.nPat, editpos.nChn, editpos.nRow, 1, 1);
p->command = CMD_SMOOTHMIDI;
p->param = nByte2;
pMainFrm->ThreadSafeSetModified(pModDoc);
@@ -4277,7 +4277,7 @@
}
// Create undo-point.
- pModDoc->GetPatternUndo()->PrepareUndo(nPat, nChn, nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(nPat, nChn, nRow, 1, 1);
// -- write sdx if playing live
if (usePlaybackPosition && nTick) { // avoid SD0 which will be mis-interpreted
@@ -4579,7 +4579,7 @@
const bool modified = (bRecordEnabled && *pTarget != newcmd);
if (modified)
{
- pModDoc->GetPatternUndo()->PrepareUndo(nPat, nChn, nRow, 1, 1);
+ pModDoc->GetPatternUndo().PrepareUndo(nPat, nChn, nRow, 1, 1);
*pTarget = newcmd;
}
@@ -4703,7 +4703,7 @@
const CHANNELINDEX nChn = GetChanFromCursor(m_dwCursor);
UINT nPlayIns = 0;
// Simply backup the whole row.
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, nChn, m_nRow, pSndFile->GetNumChannels(), 1);
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, nChn, m_nRow, pSndFile->GetNumChannels(), 1);
const PatternRow prowbase = pSndFile->Patterns[m_nPattern].GetRow(m_nRow);
MODCOMMAND* pTarget = &prowbase[nChn];
@@ -5358,7 +5358,7 @@
AppendMenu(pasteSpecialMenu, MF_STRING, ID_EDIT_PASTEFLOOD, "Paste Flood\t" + ih->GetKeyTextFromCommand(kcEditPasteFlood));
AppendMenu(pasteSpecialMenu, MF_STRING, ID_EDIT_PUSHFORWARDPASTE, "Push Forward Paste (Insert)\t" + ih->GetKeyTextFromCommand(kcEditPushForwardPaste));
- DWORD greyed = pModDoc->GetPatternUndo()->CanUndo() ? MF_ENABLED : MF_GRAYED;
+ DWORD greyed = pModDoc->GetPatternUndo().CanUndo() ? MF_ENABLED : MF_GRAYED;
if (!greyed || !(CMainFrame::GetSettings().m_dwPatternSetup & PATTERN_OLDCTXMENUSTYLE))
{
AppendMenu(hMenu, MF_STRING | greyed, ID_EDIT_UNDO, "Undo\t" + ih->GetKeyTextFromCommand(kcEditUndo));
@@ -5797,7 +5797,7 @@
if(dlg.DoModal() != IDOK || dlg.bChanged == false) return;
// Backup old name.
- pModDoc->GetPatternUndo()->PrepareUndo(m_nPattern, 0, 0, 1, 1, false, true);
+ pModDoc->GetPatternUndo().PrepareUndo(m_nPattern, 0, 0, 1, 1, false, true);
strcpy(pSndFile->ChnSettings[nChn].szName, dlg.m_sName);
pModDoc->SetModified();
Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/View_smp.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -1418,7 +1418,7 @@
if (m_bDrawingEnabled)
{
m_lastDrawPoint = point;
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
if(sample.GetElementarySampleSize() == 2)
SetInitialDrawPoint<int16, uint16>(sample.pSample, point);
else if(sample.GetElementarySampleSize() == 1)
@@ -1546,7 +1546,7 @@
::AppendMenu(hMenu, MF_STRING, ID_EDIT_COPY, "Copy\t" + ih->GetKeyTextFromCommand(kcEditCopy));
}
::AppendMenu(hMenu, MF_STRING, ID_EDIT_PASTE, "Paste\t" + ih->GetKeyTextFromCommand(kcEditPaste));
- ::AppendMenu(hMenu, MF_STRING | (pModDoc->GetSampleUndo()->CanUndo(m_nSample) ? 0 : MF_GRAYED), ID_EDIT_UNDO, "Undo\t" + ih->GetKeyTextFromCommand(kcEditUndo));
+ ::AppendMenu(hMenu, MF_STRING | (pModDoc->GetSampleUndo().CanUndo(m_nSample) ? 0 : MF_GRAYED), ID_EDIT_UNDO, "Undo\t" + ih->GetKeyTextFromCommand(kcEditUndo));
ClientToScreen(&pt);
::TrackPopupMenu(hMenu, TPM_LEFTALIGN|TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hWnd, NULL);
::DestroyMenu(hMenu);
@@ -1773,7 +1773,7 @@
|| (m_dwEndSel - m_dwBeginSel + 4 >= len))
{
if (Reporting::Confirm("Remove this sample?", "Remove Sample", true) != cnfYes) return;
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
CriticalSection cs;
pSndFile->DestroySample(m_nSample);
@@ -1782,7 +1782,7 @@
dwUpdateFlags |= HINT_SMPNAMES;
} else
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_delete, m_dwBeginSel, m_dwEndSel);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_delete, m_dwBeginSel, m_dwEndSel);
CriticalSection cs;
@@ -1971,7 +1971,7 @@
if ((hCpy) && ((p = (LPBYTE)GlobalLock(hCpy)) != NULL))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
CSoundFile *pSndFile = pModDoc->GetSoundFile();
DWORD dwMemSize = GlobalSize(hCpy);
@@ -2014,7 +2014,7 @@
{
CModDoc *pModDoc = GetDocument();
if(pModDoc == nullptr) return;
- if(pModDoc->GetSampleUndo()->Undo(m_nSample) == true)
+ if(pModDoc->GetSampleUndo().Undo(m_nSample) == true)
pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_SAMPLEDATA, NULL);
}
@@ -2030,7 +2030,7 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((sample.uFlags & CHN_16BIT) && (sample.pSample) && (sample.nLength))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
CriticalSection cs;
@@ -2068,14 +2068,14 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((sample.uFlags & CHN_STEREO) && (sample.pSample) && (sample.nLength))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
if(ctrlSmp::ConvertToMono(sample, pSndFile))
{
pModDoc->SetModified();
pModDoc->UpdateAllViews(NULL, (m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEDATA | HINT_SAMPLEINFO, NULL);
} else
{
- pModDoc->GetSampleUndo()->RemoveLastUndoStep(m_nSample);
+ pModDoc->GetSampleUndo().RemoveLastUndoStep(m_nSample);
}
}
}
@@ -2108,7 +2108,7 @@
if ((sample.pSample) && (nStart+nEnd <= sample.nLength) && (nEnd >= MIN_TRIM_LENGTH))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
CriticalSection cs;
@@ -2310,7 +2310,7 @@
{
CriticalSection cs;
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
bCanDrop = dlsbank.ExtractSample(pSndFile, m_nSample, nIns, nRgn);
}
bUpdate = TRUE;
@@ -2338,7 +2338,7 @@
}
CriticalSection cs;
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace);
bCanDrop = pDLSBank->ExtractSample(pSndFile, m_nSample, nIns, nRgn);
bUpdate = TRUE;
@@ -2404,7 +2404,7 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((m_dwMenuParam+4 <= sample.nLoopEnd) && (sample.nLoopStart != m_dwMenuParam))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_none);
sample.nLoopStart = m_dwMenuParam;
sample.uFlags |= CHN_LOOP;
pModDoc->SetModified();
@@ -2425,7 +2425,7 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((m_dwMenuParam >= sample.nLoopStart+4) && (sample.nLoopEnd != m_dwMenuParam))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_none);
sample.nLoopEnd = m_dwMenuParam;
sample.uFlags |= CHN_LOOP;
pModDoc->SetModified();
@@ -2446,7 +2446,7 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((m_dwMenuParam+4 <= sample.nSustainEnd) && (sample.nSustainStart != m_dwMenuParam))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_none);
sample.nSustainStart = m_dwMenuParam;
sample.uFlags |= CHN_SUSTAINLOOP;
pModDoc->SetModified();
@@ -2467,7 +2467,7 @@
MODSAMPLE &sample = pSndFile->GetSample(m_nSample);
if ((m_dwMenuParam >= sample.nSustainStart+4) && (sample.nSustainEnd != m_dwMenuParam))
{
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_none);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_none);
sample.nSustainEnd = m_dwMenuParam;
sample.uFlags |= CHN_SUSTAINLOOP;
pModDoc->SetModified();
@@ -2533,9 +2533,9 @@
CriticalSection cs;
if(dlg.m_nSamples < sample.nLength) // make it shorter!
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_delete, dlg.m_nSamples, sample.nLength);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_delete, dlg.m_nSamples, sample.nLength);
else // make it longer!
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_insert, sample.nLength, dlg.m_nSamples);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_insert, sample.nLength, dlg.m_nSamples);
ctrlSmp::ResizeSample(sample, dlg.m_nSamples, pSndFile);
}
} else
@@ -2546,7 +2546,7 @@
CriticalSection cs;
UINT nStart = (dlg.m_nEditOption == addsilence_at_end) ? sample.nLength : 0;
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_insert, nStart, nStart + dlg.m_nSamples);
+ pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_insert, nStart, nStart + dlg.m_nSamples);
ctrlSmp::InsertSilence(sample, dlg.m_nSamples, nStart, pSndFile);
}
}
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -1435,7 +1435,7 @@
case MODITEM_SAMPLE:
wsprintf(s, _T("Remove sample %d?"), modItemID);
if (pModDoc == nullptr || Reporting::Confirm(s, false, true) == cnfNo) break;
- pModDoc->GetSampleUndo()->PrepareUndo((SAMPLEINDEX)modItemID, sundo_replace);
+ pModDoc->GetSampleUndo().PrepareUndo((SAMPLEINDEX)modItemID, sundo_replace);
if (pModDoc->RemoveSample((SAMPLEINDEX)modItemID))
{
pModDoc->UpdateAllViews(NULL, (UINT(modItemID) << HINT_SHIFT_SMP) | HINT_SMPNAMES|HINT_SAMPLEDATA|HINT_SAMPLEINFO);
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -1674,11 +1674,11 @@
CString s;
uint64 totalTime = 0;
- const size_t num = m_pModDoc->GetFileHistory()->size();
+ const size_t num = m_pModDoc->GetFileHistory().size();
for(size_t n = 0; n < num; n++)
{
- const FileHistory *hist = &(m_pModDoc->GetFileHistory()->at(n));
+ const FileHistory *hist = &(m_pModDoc->GetFileHistory().at(n));
totalTime += hist->openTime;
// Date
@@ -1708,7 +1708,7 @@
SetWindowText(s);
}
// Enable or disable Clear button
- GetDlgItem(IDC_BTN_CLEAR)->EnableWindow((m_pModDoc->GetFileHistory()->empty()) ? FALSE : TRUE);
+ GetDlgItem(IDC_BTN_CLEAR)->EnableWindow((m_pModDoc->GetFileHistory().empty()) ? FALSE : TRUE);
return TRUE;
@@ -1718,9 +1718,9 @@
void CEditHistoryDlg::OnClearHistory()
//------------------------------------
{
- if(m_pModDoc != nullptr && !m_pModDoc->GetFileHistory()->empty())
+ if(m_pModDoc != nullptr && !m_pModDoc->GetFileHistory().empty())
{
- m_pModDoc->GetFileHistory()->clear();
+ m_pModDoc->GetFileHistory().clear();
m_pModDoc->SetModified();
OnInitDialog();
}
Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/mptrack/test/test.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -464,8 +464,8 @@
VERIFY_EQUAL_NONCONT(pSndFile->m_nRestartPos, 1);
// Edit history
- VERIFY_EQUAL_NONCONT(pModDoc->GetFileHistory()->size() > 0, true);
- const FileHistory &fh = pModDoc->GetFileHistory()->at(0);
+ VERIFY_EQUAL_NONCONT(pModDoc->GetFileHistory().size() > 0, true);
+ const FileHistory &fh = pModDoc->GetFileHistory().at(0);
VERIFY_EQUAL_NONCONT(fh.loadDate.tm_year, 111);
VERIFY_EQUAL_NONCONT(fh.loadDate.tm_mon, 5);
VERIFY_EQUAL_NONCONT(fh.loadDate.tm_mday, 14);
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2011-10-23 00:16:13 UTC (rev 1119)
@@ -840,8 +840,8 @@
mptHistory.loadDate.tm_mday = CLAMP(pHeader->creationDay, 0, 31);
mptHistory.loadDate.tm_mon = CLAMP(pHeader->creationMonth, 1, 12) - 1;
mptHistory.loadDate.tm_year = pHeader->creationYear;
- GetpModDoc()->GetFileHistory()->clear();
- GetpModDoc()->GetFileHistory()->push_back(mptHistory);
+ GetpModDoc()->GetFileHistory().clear();
+ GetpModDoc()->GetFileHistory().push_back(mptHistory);
}
#endif // MODPLUG_TRACKER
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -756,7 +756,7 @@
#ifdef MODPLUG_TRACKER
if(GetpModDoc() != nullptr)
{
- GetpModDoc()->GetFileHistory()->clear();
+ GetpModDoc()->GetFileHistory().clear();
for(size_t n = 0; n < nflt; n++)
{
ITHISTORYSTRUCT itHistory = *((ITHISTORYSTRUCT *)(lpStream + dwMemPos));
@@ -774,7 +774,7 @@
mptHistory.loadDate.tm_min = CLAMP((itHistory.fattime >> 5) & 0x3F, 0, 59);
mptHistory.loadDate.tm_sec = CLAMP((itHistory.fattime & 0x1F) * 2, 0, 59);
mptHistory.openTime = itHistory.runtime * (HISTORY_TIMER_PRECISION / 18.2f);
- GetpModDoc()->GetFileHistory()->push_back(mptHistory);
+ GetpModDoc()->GetFileHistory().push_back(mptHistory);
#ifdef DEBUG
const uint32 seconds = (uint32)(((double)itHistory.runtime) / 18.2f);
@@ -1305,7 +1305,7 @@
{
#ifdef MODPLUG_TRACKER
CModDoc *pModDoc = pSndFile->GetpModDoc();
- const size_t num = (pModDoc != nullptr) ? pModDoc->GetFileHistory()->size() + 1 : 0; // + 1 for this session
+ const size_t num = (pModDoc != nullptr) ? pModDoc->GetFileHistory().size() + 1 : 0; // + 1 for this session
#else
const size_t num = 0;
#endif // MODPLUG_TRACKER
@@ -1332,7 +1332,7 @@
if(n < num - 1)
{
// Previous timestamps
- const FileHistory *mptHistory = &(pModDoc->GetFileHistory()->at(n));
+ const FileHistory *mptHistory = &(pModDoc->GetFileHistory().at(n));
loadDate = mptHistory->loadDate;
openTime = mptHistory->openTime * (18.2f / HISTORY_TIMER_PRECISION);
} else
Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp 2011-10-22 23:25:38 UTC (rev 1118)
+++ trunk/OpenMPT/soundlib/pattern.cpp 2011-10-23 00:16:13 UTC (rev 1119)
@@ -153,7 +153,7 @@
if (!newPattern) return true;
const PATTERNINDEX nPattern = m_rPatternContainer.GetIndex(this);
- rModDoc.GetPatternUndo()->PrepareUndo(nPattern, 0, 0, nChns, nRows);
+ rModDoc.GetPatternUndo().PrepareUndo(nPattern, 0, 0, nChns, nRows);
oldPattern = m_ModCommands;
for (ROWINDEX y = 0; y < nRows; y++)
{
@@ -182,7 +182,7 @@
ROWINDEX nRows = m_Rows;
const CHANNELINDEX nChns = sndFile.m_nChannels;
const PATTERNINDEX nPattern = m_rPatternContainer.GetIndex(this);
- rModDoc.GetPatternUndo()->PrepareUndo(nPattern, 0, 0, nChns, nRows);
+ rModDoc.GetPatternUndo().PrepareUndo(nPattern, 0, 0, nChns, nRows);
nRows /= 2;
for (ROWINDEX y = 0; y < nRows; y++)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
