Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1135] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-11-13 00:59:24
|
Revision: 1135
http://modplug.svn.sourceforge.net/modplug/?rev=1135&view=rev
Author: saga-games
Date: 2011-11-13 00:59:17 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
[Fix] Pattern names were not duplicated (http://bugs.openmpt.org/view.php?id=208)
[Fix] Instrument list on comments tab had sample 0 in all sample lists.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/view_com.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-11-12 17:26:58 UTC (rev 1134)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-11-13 00:59:17 UTC (rev 1135)
@@ -814,10 +814,10 @@
}
+// Duplicates one or more patterns.
void CCtrlPatterns::OnPatternDuplicate()
//--------------------------------------
{
- // duplicates one or more patterns.
if (m_pModDoc)
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
@@ -828,53 +828,64 @@
if (nInsertWhere >= pSndFile->GetModSpecifications().ordersMax)
return;
bool bSuccess = false;
- // has this pattern been duplicated already? (for multiselect)
- vector<PATTERNINDEX> pReplaceIndex;
- pReplaceIndex.resize(pSndFile->Patterns.Size(), PATTERNINDEX_INVALID);
+ // Has this pattern been duplicated already? (for multiselect)
+ vector<PATTERNINDEX> patReplaceIndex(pSndFile->Patterns.Size(), PATTERNINDEX_INVALID);
for(ORDERINDEX i = 0; i <= nInsertCount; i++)
{
PATTERNINDEX nCurPat = pSndFile->Order[selection.nOrdLo + i];
- ROWINDEX rows = 64;
- if (pSndFile->Patterns.IsValidIndex(nCurPat) && pReplaceIndex[nCurPat] == PATTERNINDEX_INVALID)
+ if (pSndFile->Patterns.IsValidIndex(nCurPat) && patReplaceIndex[nCurPat] == PATTERNINDEX_INVALID)
{
- rows = pSndFile->Patterns[nCurPat].GetNumRows();
- rows = CLAMP(rows, pSndFile->GetModSpecifications().patternRowsMin, pSndFile->GetModSpecifications().patternRowsMax);
+ ROWINDEX rows = pSndFile->Patterns[nCurPat].GetNumRows();
+ Limit(rows, pSndFile->GetModSpecifications().patternRowsMin, pSndFile->GetModSpecifications().patternRowsMax);
PATTERNINDEX nNewPat = m_pModDoc->InsertPattern(nInsertWhere + i, rows);
if ((nNewPat != PATTERNINDEX_INVALID) && (nNewPat < pSndFile->Patterns.Size()) && (pSndFile->Patterns[nCurPat] != nullptr))
{
- // update time signature
+ // Update time signature and pattern name
if(pSndFile->Patterns[nCurPat].GetOverrideSignature())
{
pSndFile->Patterns[nNewPat].SetSignature(pSndFile->Patterns[nCurPat].GetRowsPerBeat(), pSndFile->Patterns[nCurPat].GetRowsPerMeasure());
}
- // copy pattern data
- MODCOMMAND *pSrc = pSndFile->Patterns[nCurPat];
- MODCOMMAND *pDest = pSndFile->Patterns[nNewPat];
- UINT n = pSndFile->Patterns[nCurPat].GetNumRows();
+ pSndFile->Patterns[nNewPat].SetName(pSndFile->Patterns[nCurPat].GetName());
+
+ // Copy pattern data
+ size_t n = pSndFile->Patterns[nCurPat].GetNumRows();
if (pSndFile->Patterns[nNewPat].GetNumRows() < n) n = pSndFile->Patterns[nNewPat].GetNumRows();
- n *= pSndFile->m_nChannels;
- if (n) memcpy(pDest, pSrc, n * sizeof(MODCOMMAND));
+ n *= pSndFile->GetNumChannels();
+ if(n)
+ {
+ memcpy(pSndFile->Patterns[nNewPat], pSndFile->Patterns[nCurPat], n * sizeof(MODCOMMAND));
+ }
bSuccess = true;
- pReplaceIndex[nCurPat] = nNewPat; // mark as duplicated
- }
- else
+ // Mark as duplicated, so if this pattern is to be duplicated again, the same new pattern number is inserted into the order list.
+ patReplaceIndex[nCurPat] = nNewPat;
+ } else
{
- break;
+ continue;
}
- }
- else
+ } else
{
- // invalid pattern, or it has been duplicated before (multiselect)
+ // Invalid pattern, or it has been duplicated before (multiselect)
for (int j = pSndFile->Order.size() - 1; j > selection.nOrdLo + i + nInsertCount + 1; j--) pSndFile->Order[j] = pSndFile->Order[j - 1];
- PATTERNINDEX nNewPat;
- if(nCurPat < pSndFile->Patterns.Size() && pReplaceIndex[nCurPat] != PATTERNINDEX_INVALID)
- nNewPat = pReplaceIndex[nCurPat]; // take care of patterns that have been duplicated before
- else
- nNewPat= pSndFile->Order[selection.nOrdLo + i];
+
+ PATTERNINDEX nNewPat;
+ if(nCurPat < pSndFile->Patterns.Size() && patReplaceIndex[nCurPat] != PATTERNINDEX_INVALID)
+ {
+ // Take care of patterns that have been duplicated before
+ nNewPat = patReplaceIndex[nCurPat];
+ } else
+ {
+ nNewPat = pSndFile->Order[selection.nOrdLo + i];
+ }
+
if (selection.nOrdLo + i + nInsertCount + 1 < pSndFile->Order.GetLength())
+ {
pSndFile->Order[selection.nOrdLo + i + nInsertCount + 1] = nNewPat;
+ }
+
+ bSuccess = true;
+
}
}
if(bSuccess)
@@ -883,7 +894,7 @@
m_OrderList.SetCurSel(nInsertWhere);
SetCurrentPattern(pSndFile->Order[min(nInsertWhere, pSndFile->Order.GetLastIndex())]);
m_pModDoc->SetModified();
- m_pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE|HINT_PATNAMES, this);
+ m_pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE | HINT_PATNAMES, this);
if(selection.nOrdHi != selection.nOrdLo) m_OrderList.m_nScrollPos2nd = nInsertWhere + nInsertCount;
}
}
@@ -911,7 +922,8 @@
{
CModDoc *pModDoc = GetDocument();
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if ((pMainFrm) && (pModDoc)) {
+ if ((pMainFrm) && (pModDoc))
+ {
pModDoc->OnPatternPlay();
}
SwitchToView();
@@ -923,7 +935,8 @@
{
CModDoc *pModDoc = GetDocument();
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if ((pMainFrm) && (pModDoc)) {
+ if ((pMainFrm) && (pModDoc))
+ {
pModDoc->OnPatternPlayNoLoop();
}
SwitchToView();
@@ -935,7 +948,8 @@
{
CModDoc *pModDoc = GetDocument();
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if ((pMainFrm) && (pModDoc)) {
+ if ((pMainFrm) && (pModDoc))
+ {
pModDoc->OnPatternRestart();
}
SwitchToView();
Modified: trunk/OpenMPT/mptrack/view_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/view_com.cpp 2011-11-12 17:26:58 UTC (rev 1134)
+++ trunk/OpenMPT/mptrack/view_com.cpp 2011-11-13 00:59:17 UTC (rev 1135)
@@ -237,7 +237,7 @@
// Add Samples
if ((m_nCurrentListId == IDC_LIST_SAMPLES) && (lHint & (HINT_MODTYPE|HINT_SMPNAMES|HINT_SAMPLEINFO)))
{
- UINT nMax = nCount;
+ SAMPLEINDEX nMax = static_cast<SAMPLEINDEX>(nCount);
if (nMax < pSndFile->GetNumSamples()) nMax = pSndFile->GetNumSamples();
for (SAMPLEINDEX iSmp = 0; iSmp < nMax; iSmp++)
{
@@ -341,11 +341,11 @@
// Add Instruments
if ((m_nCurrentListId == IDC_LIST_INSTRUMENTS) && (lHint & (HINT_MODTYPE|HINT_INSNAMES|HINT_INSTRUMENT)))
{
- UINT nMax = nCount;
+ INSTRUMENTINDEX nMax = static_cast<INSTRUMENTINDEX>(nCount);
if (nMax < pSndFile->GetNumInstruments()) nMax = pSndFile->GetNumInstruments();
- for (UINT iIns=0; iIns<nMax; iIns++)
+ for (INSTRUMENTINDEX iIns = 0; iIns < nMax; iIns++)
{
- if (iIns < pSndFile->m_nInstruments)
+ if (iIns < pSndFile->GetNumInstruments())
{
UINT nCol = 0;
for (UINT iCol=0; iCol<INSLIST_COLUMNS; iCol++)
@@ -366,7 +366,11 @@
std::set<SAMPLEINDEX> referencedSamples;
for(size_t i = 0; i < CountOf(pIns->Keyboard); i++)
{
- referencedSamples.insert(pIns->Keyboard[i]);
+ // 0 isn't a sample.
+ if(pIns->Keyboard[i] != 0)
+ {
+ referencedSamples.insert(pIns->Keyboard[i]);
+ }
}
bool first = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
