Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-05 03:03:10 +01:00
Code Issues Releases Wiki Activity

Use standard library style members of wxArrayString (and wxString) ...

Browse Source 
... which will make it easier to change the types of those containers to
std::vectors of other string-like classes

for wxString,

IsEmpty => empty
Clear => clear
Alloc => reserve

for wxArrayString,

Count => size
GetCount => size
IsEmpty => empty
Add => push_back
Clear => clear
Empty => clear
Sort => std::sort (only with default comparator)
SetCount => resize
Last => back
Item => operator []
Alloc => reserve
This commit is contained in:
Paul Licameli
2019-02-11 19:10:48 -05:00
parent 5daa67dfe6
commit 2db49dc1f0
115 changed files with 728 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MixerBoard.cpp
View File

@@ -785,16 +785,16 @@ MusicalInstrument::MusicalInstrument(std::unique_ptr<wxBitmap> &&pBitmap, const
while ((nUnderscoreIndex = strFilename.Find(wxT('_'))) != -1)
{
strKeyword = strFilename.Left(nUnderscoreIndex);
mKeywords.Add(strKeyword);
mKeywords.push_back(strKeyword);
strFilename = strFilename.Mid(nUnderscoreIndex + 1);
}
if (!strFilename.IsEmpty()) // Skip trailing underscores.
mKeywords.Add(strFilename); // Add the last one.
if (!strFilename.empty()) // Skip trailing underscores.
mKeywords.push_back(strFilename); // Add the last one.
}
MusicalInstrument::~MusicalInstrument()
{
mKeywords.Clear();
mKeywords.clear();
}
@@ -899,7 +899,7 @@ MixerBoard::MixerBoard(AudacityProject* pProject,
/* This doesn't work to make the mScrolledWindow automatically resize, so do it explicitly in OnSize.
auto pBoxSizer = std::make_unique<wxBoxSizer>(wxVERTICAL);
pBoxSizer->Add(mScrolledWindow, 0, wxExpand, 0);
pBoxSizer->push_back(mScrolledWindow, 0, wxExpand, 0);
this->SetAutoLayout(true);
this->SetSizer(pBoxSizer);
pBoxSizer->Fit(this);
@@ -964,7 +964,7 @@ void MixerBoard::UpdatePrefs()
mImageSoloDown.reset();
mImageSoloDisabled.reset();
}
for (unsigned int nClusterIndex = 0; nClusterIndex < mMixerTrackClusters.GetCount(); nClusterIndex++)
for (unsigned int nClusterIndex = 0; nClusterIndex < mMixerTrackClusters.size(); nClusterIndex++)
mMixerTrackClusters[nClusterIndex]->UpdatePrefs();
Refresh();
#endif
@@ -1072,7 +1072,7 @@ wxBitmap* MixerBoard::GetMusicalInstrumentBitmap(const Track* pTrack)
if (mMusicalInstruments.empty())
return NULL;
// random choice: return mMusicalInstruments[(int)pTrack % mMusicalInstruments.GetCount()].mBitmap;
// random choice: return mMusicalInstruments[(int)pTrack % mMusicalInstruments.size()].mBitmap;
const wxString strTrackName(pTrack->GetName().MakeLower());
size_t nBestItemIndex = 0;
@@ -1086,7 +1086,7 @@ wxBitmap* MixerBoard::GetMusicalInstrumentBitmap(const Track* pTrack)
{
nScore = 0;
nNumKeywords = mMusicalInstruments[nInstrIndex]->mKeywords.GetCount();
nNumKeywords = mMusicalInstruments[nInstrIndex]->mKeywords.size();
if (nNumKeywords > 0)
{
nPointsPerMatch = 10 / nNumKeywords;