Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1184] trunk/OpenMPT
|
From: <sag...@us...> - 2012-02-18 12:52:02
|
Revision: 1184
http://modplug.svn.sourceforge.net/modplug/?rev=1184&view=rev
Author: saga-games
Date: 2012-02-18 12:51:50 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
[Ref] Renamed m_nCurrentPattern and m_nNextPattern to m_nCurrentOrder and m_nNextOrder to avoid confusion.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -307,7 +307,7 @@
m_pModDoc->SetElapsedTime(m_nScrollPos, 0);
pSndFile->m_nPattern = n;
- pSndFile->m_nCurrentPattern = pSndFile->m_nNextPattern = m_nScrollPos;
+ pSndFile->m_nCurrentOrder = pSndFile->m_nNextOrder = m_nScrollPos;
pMainFrm->ResetNotificationBuffer(); //rewbs.toCheck
pSndFile->m_nNextRow = 0;
@@ -321,7 +321,7 @@
// update channel parameters and play time
m_pModDoc->SetElapsedTime(m_nScrollPos, 0);
- pSndFile->m_nCurrentPattern = m_nScrollPos;
+ pSndFile->m_nCurrentOrder = m_nScrollPos;
pSndFile->SetCurrentOrder(m_nScrollPos);
pSndFile->m_dwSongFlags |= dwPaused;
if (bIsPlaying) pMainFrm->ResetNotificationBuffer();
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -1048,7 +1048,7 @@
p->dwType = m_dwNotifyType;
DWORD d = dwLatency / slSampleSize;
p->dwLatency = gsdwTotalSamples + d;
- p->nOrder = m_pSndFile->m_nCurrentPattern;
+ p->nOrder = m_pSndFile->m_nCurrentOrder;
p->nRow = m_pSndFile->m_nRow;
p->nPattern = m_pSndFile->m_nPattern;
if (m_dwNotifyType & MPTNOTIFY_SAMPLE)
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -1692,7 +1692,7 @@
{
m_SndFile.SetCurrentOrder(wsdlg.m_nMinOrder);
m_SndFile.GetLength(eAdjust, wsdlg.m_nMinOrder, 0); // adjust playback variables / visited rows vector
- m_SndFile.m_nCurrentPattern = wsdlg.m_nMinOrder;
+ m_SndFile.m_nCurrentOrder = wsdlg.m_nMinOrder;
m_SndFile.m_nMaxOrderPosition = wsdlg.m_nMaxOrder + 1;
}
if(dwcdlg.DoModal() != IDOK) break;
@@ -1931,9 +1931,9 @@
{
CriticalSection cs;
- if ((m_SndFile.m_nCurrentPattern < m_SndFile.Order.size()) && (m_SndFile.Order[m_SndFile.m_nCurrentPattern] == nPat))
+ if ((m_SndFile.m_nCurrentOrder < m_SndFile.Order.size()) && (m_SndFile.Order[m_SndFile.m_nCurrentOrder] == nPat))
{
- m_SndFile.m_nNextPattern = m_SndFile.m_nCurrentPattern;
+ m_SndFile.m_nNextOrder = m_SndFile.m_nCurrentOrder;
m_SndFile.m_nNextRow = nNextRow;
m_SndFile.m_nRow = nRow;
} else
@@ -1943,8 +1943,8 @@
if (m_SndFile.Order[nOrd] == m_SndFile.Order.GetInvalidPatIndex()) break;
if (m_SndFile.Order[nOrd] == nPat)
{
- m_SndFile.m_nCurrentPattern = nOrd;
- m_SndFile.m_nNextPattern = nOrd;
+ m_SndFile.m_nCurrentOrder = nOrd;
+ m_SndFile.m_nNextOrder = nOrd;
m_SndFile.m_nNextRow = nNextRow;
m_SndFile.m_nRow = nRow;
break;
@@ -3261,7 +3261,7 @@
pSndFile->Chn[i].nFadeOutVol = 0;
pSndFile->Chn[i].dwFlags |= CHN_NOTEFADE | CHN_KEYOFF;
}
- if ((nOrd < m_SndFile.Order.size()) && (pSndFile->Order[nOrd] == nPat)) pSndFile->m_nCurrentPattern = pSndFile->m_nNextPattern = nOrd;
+ if ((nOrd < m_SndFile.Order.size()) && (pSndFile->Order[nOrd] == nPat)) pSndFile->m_nCurrentOrder = pSndFile->m_nNextOrder = nOrd;
pSndFile->m_dwSongFlags &= ~(SONG_PAUSED|SONG_STEP);
pSndFile->LoopPattern(nPat);
pSndFile->m_nNextRow = 0;
@@ -3320,7 +3320,7 @@
{
pSndFile->Chn[i].dwFlags |= CHN_NOTEFADE | CHN_KEYOFF;
}
- if ((nOrd < m_SndFile.Order.size()) && (pSndFile->Order[nOrd] == nPat)) pSndFile->m_nCurrentPattern = pSndFile->m_nNextPattern = nOrd;
+ if ((nOrd < m_SndFile.Order.size()) && (pSndFile->Order[nOrd] == nPat)) pSndFile->m_nCurrentOrder = pSndFile->m_nNextOrder = nOrd;
pSndFile->m_dwSongFlags &= ~(SONG_PAUSED|SONG_STEP);
pSndFile->LoopPattern(nPat);
pSndFile->m_nNextRow = nRow;
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -2246,7 +2246,7 @@
//If song is set to loop and a pattern break occurs we should stay on the same pattern.
//Use nPosJump to force playback to "jump to this pattern" rather than move to next, as by default.
//rewbs.to
- nPosJump = (int)m_nCurrentPattern;
+ nPosJump = (int)m_nCurrentOrder;
}
break;
@@ -2284,19 +2284,19 @@
// Pattern Loop
if (nPatLoopRow != ROWINDEX_INVALID)
{
- m_nNextPattern = m_nCurrentPattern;
+ m_nNextOrder = m_nCurrentOrder;
m_nNextRow = nPatLoopRow;
if (m_nPatternDelay) m_nNextRow++;
// As long as the pattern loop is running, mark the looped rows as not visited yet
for(ROWINDEX nRow = nPatLoopRow; nRow <= m_nRow; nRow++)
{
- SetRowVisited(m_nCurrentPattern, nRow, false);
+ SetRowVisited(m_nCurrentOrder, nRow, false);
}
} else
// Pattern Break / Position Jump only if no loop running
if ((nBreakRow != ROWINDEX_INVALID) || (nPosJump != ORDERINDEX_INVALID))
{
- if (nPosJump == ORDERINDEX_INVALID) nPosJump = m_nCurrentPattern + 1;
+ if (nPosJump == ORDERINDEX_INVALID) nPosJump = m_nCurrentOrder + 1;
if (nBreakRow == ROWINDEX_INVALID) nBreakRow = 0;
m_dwSongFlags |= SONG_BREAKTOROW;
@@ -2310,14 +2310,14 @@
//if((nPosJump != (int)m_nCurrentPattern) || (nBreakRow != (int)m_nRow))
{
// IT compatibility: don't reset loop count on pattern break
- if (nPosJump != (int)m_nCurrentPattern && !IsCompatibleMode(TRK_IMPULSETRACKER))
+ if (nPosJump != (int)m_nCurrentOrder && !IsCompatibleMode(TRK_IMPULSETRACKER))
{
for (CHANNELINDEX i = 0; i < m_nChannels; i++)
{
Chn[i].nPatternLoopCount = 0;
}
}
- m_nNextPattern = nPosJump;
+ m_nNextOrder = nPosJump;
m_nNextRow = nBreakRow;
m_bPatternTransitionOccurred = true;
}
@@ -3957,7 +3957,7 @@
// Big Hack!!!
if ((!param) || (param >= 0x80) || ((GetType() & (MOD_TYPE_MOD|MOD_TYPE_XM|MOD_TYPE_MT2)) && (param >= 0x1E)))
{
- if ((!m_nRepeatCount) && (IsSongFinished(m_nCurrentPattern, m_nRow+1)))
+ if ((!m_nRepeatCount) && (IsSongFinished(m_nCurrentOrder, m_nRow+1)))
{
GlobalFadeSong(1000);
}
@@ -4375,7 +4375,7 @@
{
m_nPattern = Order[m_nSeqOverride - 1];
}
- m_nNextPattern = m_nSeqOverride - 1;
+ m_nNextOrder = m_nSeqOverride - 1;
m_nSeqOverride = 0;
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -533,8 +533,8 @@
m_nNextRow = 0;
m_nRow = 0;
m_nPattern = 0;
- m_nCurrentPattern = 0;
- m_nNextPattern = 0;
+ m_nCurrentOrder = 0;
+ m_nNextOrder = 0;
m_nNextPatStartRow = 0;
m_nSeqOverride = 0;
m_nRestartPos = 0;
@@ -731,8 +731,8 @@
m_nGlobalVolumeDestination = m_nGlobalVolume;
m_nSamplesToGlobalVolRampDest = 0;
m_nGlobalVolumeRampAmount = 0;
- m_nNextPattern = 0;
- m_nCurrentPattern = 0;
+ m_nNextOrder = 0;
+ m_nCurrentOrder = 0;
m_nPattern = 0;
m_nBufferCount = 0;
m_dBufferDiff = 0;
@@ -994,7 +994,7 @@
{
UINT pos = 0;
- for (UINT i=0; i<m_nCurrentPattern; i++) if (Order[i] < Patterns.Size())
+ for (UINT i=0; i<m_nCurrentOrder; i++) if (Order[i] < Patterns.Size())
pos += Patterns[Order[i]].GetNumRows();
return pos + m_nRow;
}
@@ -1075,7 +1075,7 @@
}
}
}
- m_nNextPattern = nPattern;
+ m_nNextOrder = nPattern;
m_nNextRow = nRow;
m_nTickCount = m_nMusicSpeed;
m_nBufferCount = 0;
@@ -1120,7 +1120,7 @@
SetCurrentPos(0);
} else
{
- m_nNextPattern = nOrder;
+ m_nNextOrder = nOrder;
m_nRow = m_nNextRow = 0;
m_nPattern = 0;
m_nTickCount = m_nMusicSpeed;
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2012-02-18 12:51:50 UTC (rev 1184)
@@ -647,8 +647,7 @@
ROWINDEX m_nNextRow, m_nRow;
ROWINDEX m_nNextPatStartRow; // for FT2's E60 bug
PATTERNINDEX m_nPattern;
- ORDERINDEX m_nCurrentPattern, m_nNextPattern, m_nRestartPos, m_nSeqOverride;
- //NOTE: m_nCurrentPattern and m_nNextPattern refer to order index - not pattern index.
+ ORDERINDEX m_nCurrentOrder, m_nNextOrder, m_nRestartPos, m_nSeqOverride;
bool m_bPatternTransitionOccurred;
UINT m_nMasterVolume, m_nGlobalVolume, m_nSamplesToGlobalVolRampDest, m_nGlobalVolumeRampAmount,
m_nGlobalVolumeDestination, m_nSamplePreAmp, m_nVSTiVolume;
@@ -668,7 +667,7 @@
MODSAMPLE Samples[MAX_SAMPLES]; // Sample Headers
public:
MODINSTRUMENT *Instruments[MAX_INSTRUMENTS]; // Instrument Headers
- MIDIMacroConfig m_MidiCfg; // Midi macro config table
+ MIDIMacroConfig m_MidiCfg; // MIDI Macro config table
SNDMIXPLUGIN m_MixPlugins[MAX_MIXPLUGINS]; // Mix plugins
CHAR m_szNames[MAX_SAMPLES][MAX_SAMPLENAME]; // Song and sample names
CHAR CompressionTable[16]; // ADPCM compression LUT
@@ -707,7 +706,7 @@
SAMPLEINDEX GetNumSamples() const { return m_nSamples; }
UINT GetCurrentPos() const;
PATTERNINDEX GetCurrentPattern() const { return m_nPattern; }
- ORDERINDEX GetCurrentOrder() const { return static_cast<ORDERINDEX>(m_nCurrentPattern); }
+ ORDERINDEX GetCurrentOrder() const { return static_cast<ORDERINDEX>(m_nCurrentOrder); }
CHANNELINDEX GetNumChannels() const { return m_nChannels; }
IMixPlugin* GetInstrumentPlugin(INSTRUMENTINDEX instr);
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2012-02-17 21:36:02 UTC (rev 1183)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2012-02-18 12:51:50 UTC (rev 1184)
@@ -324,18 +324,18 @@
if (ReadNote())
{
// Save pattern cue points for WAV rendering here (if we reached a new pattern, that is.)
- if(m_bIsRendering && (m_PatternCuePoints.empty() || m_nCurrentPattern != m_PatternCuePoints.back().order))
+ if(m_bIsRendering && (m_PatternCuePoints.empty() || m_nCurrentOrder != m_PatternCuePoints.back().order))
{
PatternCuePoint cue;
cue.offset = lMax - lRead;
- cue.order = m_nCurrentPattern;
+ cue.order = m_nCurrentOrder;
cue.processed = false; // We don't know the base offset in the file here. It has to be added in the main conversion loop.
m_PatternCuePoints.push_back(cue);
}
} else
{
#ifdef MODPLUG_TRACKER
- if ((m_nMaxOrderPosition) && (m_nCurrentPattern >= m_nMaxOrderPosition))
+ if ((m_nMaxOrderPosition) && (m_nCurrentOrder >= m_nMaxOrderPosition))
{
m_dwSongFlags |= SONG_ENDREACHED;
break;
@@ -681,28 +681,28 @@
m_nTickCount = 0;
m_nRow = m_nNextRow;
// Reset Pattern Loop Effect
- if (m_nCurrentPattern != m_nNextPattern)
- m_nCurrentPattern = m_nNextPattern;
+ if (m_nCurrentOrder != m_nNextOrder)
+ m_nCurrentOrder = m_nNextOrder;
// Check if pattern is valid
if (!(m_dwSongFlags & SONG_PATTERNLOOP))
{
- m_nPattern = (m_nCurrentPattern < Order.size()) ? Order[m_nCurrentPattern] : Order.GetInvalidPatIndex();
+ m_nPattern = (m_nCurrentOrder < Order.size()) ? Order[m_nCurrentOrder] : Order.GetInvalidPatIndex();
if ((m_nPattern < Patterns.Size()) && (!Patterns[m_nPattern])) m_nPattern = Order.GetIgnoreIndex();
while (m_nPattern >= Patterns.Size())
{
// End of song?
- if ((m_nPattern == Order.GetInvalidPatIndex()) || (m_nCurrentPattern >= Order.size()))
+ if ((m_nPattern == Order.GetInvalidPatIndex()) || (m_nCurrentOrder >= Order.size()))
{
//if (!m_nRepeatCount) return FALSE;
ORDERINDEX nRestartPosOverride = m_nRestartPos;
- if(!m_nRestartPos && m_nCurrentPattern <= Order.size() && m_nCurrentPattern > 0)
+ if(!m_nRestartPos && m_nCurrentOrder <= Order.size() && m_nCurrentOrder > 0)
{
/* Subtune detection. Subtunes are separated by "---" order items, so if we're in a
subtune and there's no restart position, we go to the first order of the subtune
(i.e. the first order after the previous "---" item) */
- for(ORDERINDEX iOrd = m_nCurrentPattern - 1; iOrd > 0; iOrd--)
+ for(ORDERINDEX iOrd = m_nCurrentOrder - 1; iOrd > 0; iOrd--)
{
if(Order[iOrd] == Order.GetInvalidPatIndex())
{
@@ -762,17 +762,17 @@
//Handle Repeat position
if (m_nRepeatCount > 0) m_nRepeatCount--;
- m_nCurrentPattern = nRestartPosOverride;
+ m_nCurrentOrder = nRestartPosOverride;
m_dwSongFlags &= ~SONG_BREAKTOROW;
//If restart pos points to +++, move along
- while (Order[m_nCurrentPattern] == Order.GetIgnoreIndex())
+ while (Order[m_nCurrentOrder] == Order.GetIgnoreIndex())
{
- m_nCurrentPattern++;
+ m_nCurrentOrder++;
}
//Check for end of song or bad pattern
- if (m_nCurrentPattern >= Order.size()
- || (Order[m_nCurrentPattern] >= Patterns.Size())
- || (!Patterns[Order[m_nCurrentPattern]]) )
+ if (m_nCurrentOrder >= Order.size()
+ || (Order[m_nCurrentOrder] >= Patterns.Size())
+ || (!Patterns[Order[m_nCurrentOrder]]) )
{
InitializeVisitedRows(true);
return FALSE;
@@ -780,21 +780,21 @@
} else
{
- m_nCurrentPattern++;
+ m_nCurrentOrder++;
}
- if (m_nCurrentPattern < Order.size())
- m_nPattern = Order[m_nCurrentPattern];
+ if (m_nCurrentOrder < Order.size())
+ m_nPattern = Order[m_nCurrentOrder];
else
m_nPattern = Order.GetInvalidPatIndex();
if ((m_nPattern < Patterns.Size()) && (!Patterns[m_nPattern]))
m_nPattern = Order.GetIgnoreIndex();
}
- m_nNextPattern = m_nCurrentPattern;
+ m_nNextOrder = m_nCurrentOrder;
#ifdef MODPLUG_TRACKER
- if ((m_nMaxOrderPosition) && (m_nCurrentPattern >= m_nMaxOrderPosition)) return FALSE;
+ if ((m_nMaxOrderPosition) && (m_nCurrentOrder >= m_nMaxOrderPosition)) return FALSE;
#endif // MODPLUG_TRACKER
}
@@ -808,7 +808,7 @@
// the pattern loop (editor flag, not to be confused with the pattern loop effect)
// flag is set - because in that case, the module would stop after the first pattern loop...
const bool overrideLoopCheck = (m_nRepeatCount != -1) && (m_dwSongFlags & SONG_PATTERNLOOP);
- if(!overrideLoopCheck && IsRowVisited(m_nCurrentPattern, m_nRow, true))
+ if(!overrideLoopCheck && IsRowVisited(m_nCurrentOrder, m_nRow, true))
{
if(m_nRepeatCount)
{
@@ -819,7 +819,7 @@
}
// Forget all but the current row.
InitializeVisitedRows(true);
- SetRowVisited(m_nCurrentPattern, m_nRow);
+ SetRowVisited(m_nCurrentOrder, m_nRow);
} else
{
#ifdef MODPLUG_TRACKER
@@ -827,7 +827,7 @@
// The visited rows vector might have been screwed up while editing...
// This is of course not possible during rendering to WAV, so we ignore that case.
GetLengthType t = GetLength(eNoAdjust);
- if((gdwSoundSetup & SNDMIX_DIRECTTODISK) || (t.lastOrder == m_nCurrentPattern && t.lastRow == m_nRow))
+ if((gdwSoundSetup & SNDMIX_DIRECTTODISK) || (t.lastOrder == m_nCurrentOrder && t.lastRow == m_nRow))
#else
if(1)
#endif // MODPLUG_TRACKER
@@ -838,7 +838,7 @@
} else
{
// Ok, this is really dirty, but we have to update the visited rows vector...
- GetLength(eAdjustOnSuccess, m_nCurrentPattern, m_nRow);
+ GetLength(eAdjustOnSuccess, m_nCurrentOrder, m_nRow);
}
}
}
@@ -846,7 +846,7 @@
m_nNextRow = m_nRow + 1;
if (m_nNextRow >= Patterns[m_nPattern].GetNumRows())
{
- if (!(m_dwSongFlags & SONG_PATTERNLOOP)) m_nNextPattern = m_nCurrentPattern + 1;
+ if (!(m_dwSongFlags & SONG_PATTERNLOOP)) m_nNextOrder = m_nCurrentOrder + 1;
m_bPatternTransitionOccurred = true;
m_nNextRow = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
