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

Revert "Provide STL idiom for iterating tracks..."

Browse Source 
Unsafe on MSVC 2013.
This commit is contained in:
James Crook
2018-01-14 14:24:21 +00:00
parent 549fa48a24
commit 7fb5ec4b7a
4 changed files with 48 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/Track.cpp
View File

@@ -321,12 +321,12 @@ bool PlayableTrack::HandleXMLAttribute(const wxChar *attr, const wxChar *value)
}
// TrackListIterator
TrackListIterator::TrackListIterator(TrackList * val, TrackNodePointer p)
: l{ val }
, cur{ p }
TrackListIterator::TrackListIterator(TrackList * val)
: l(val)
, cur{}
{
if ( l && p == TrackNodePointer{} )
cur = l->ListOfTracks::begin();
if (l)
cur = l->begin();
}
Track *TrackListIterator::StartWith(Track * val)
@@ -356,7 +356,7 @@ Track *TrackListIterator::First(TrackList * val)
return NULL;
}
cur = l->ListOfTracks::begin();
cur = l->begin();
if (!l->isNull(cur)) {
return cur->get();
@@ -371,7 +371,7 @@ Track *TrackListIterator::Last(bool skiplinked)
return NULL;
}
cur = l->ListOfTracks::end();
cur = l->end();
if (l->hasPrev(cur))
--cur;
else
@@ -442,14 +442,6 @@ Track *TrackListIterator::Prev(bool skiplinked)
return cur->get();
}
Track *TrackListIterator::operator *() const
{
if ( !l || l->isNull( cur ) )
return nullptr;
else
return cur->get();
}
Track *TrackListIterator::RemoveCurrent()
{
if (!l || l->isNull(cur))
@@ -468,21 +460,6 @@ Track *TrackListIterator::RemoveCurrent()
return NULL;
}
bool TrackListIterator::operator == (const TrackListIterator &other) const
{
if (cur == other.cur)
// sufficient but not necessary
return true;
// Also return true whenever each contains either an end iterator or is
// in default-constructed state.
bool isEnd = !l || l->isNull( cur );
if (isEnd)
return !other.l || other.l->isNull( other.cur );
return false;
}
//
// TrackListCondIterator (base class for iterators that iterate over all tracks
// that meet a condition)
@@ -764,11 +741,9 @@ void TrackList::DoAssign(const TrackList &that)
void TrackList::Swap(TrackList &that)
{
ListOfTracks::swap(that);
for (auto it = ListOfTracks::begin(), last = ListOfTracks::end();
it != last; ++it)
for (auto it = begin(), last = end(); it != last; ++it)
(*it)->SetOwner(this->mSelf, it);
for (auto it = that.ListOfTracks::begin(), last = that.ListOfTracks::end();
it != last; ++it)
for (auto it = that.begin(), last = that.end(); it != last; ++it)
(*it)->SetOwner(that.mSelf, it);
}
@@ -795,8 +770,8 @@ void TrackList::RecalcPositions(TrackNodePointer node)
}
const auto theEnd = end();
for (auto n = TrackListIterator{ this, node }; n != theEnd; ++n) {
t = *n;
for (auto n = node; n != theEnd; ++n) {
t = n->get();
t->SetIndex(i++);
t->SetY(y);
y += t->GetHeight();
@@ -828,12 +803,12 @@ void TrackList::ResizingEvent(TrackNodePointer node)
void TrackList::Permute(const std::vector<TrackNodePointer> &permutation)
{
for (const auto iter : permutation) {
ListOfTracks::value_type track = std::move(*iter);
value_type track = std::move(*iter);
erase(iter);
Track *pTrack = track.get();
pTrack->SetOwner(mSelf, insert(ListOfTracks::end(), std::move(track)));
pTrack->SetOwner(mSelf, insert(end(), std::move(track)));
}
auto n = ListOfTracks::begin();
auto n = begin();
RecalcPositions(n);
PermutationEvent();
}
@@ -842,8 +817,8 @@ template<typename TrackKind>
Track *TrackList::Add(std::unique_ptr<TrackKind> &&t)
{
Track *pTrack;
push_back(ListOfTracks::value_type(pTrack = t.release()));
auto n = ListOfTracks::end();
push_back(value_type(pTrack = t.release()));
auto n = end();
--n;
pTrack->SetOwner(mSelf, n);
RecalcPositions(n);
@@ -864,8 +839,8 @@ template<typename TrackKind>
Track *TrackList::AddToHead(std::unique_ptr<TrackKind> &&t)
{
Track *pTrack;
push_front(ListOfTracks::value_type(pTrack = t.release()));
auto n = ListOfTracks::begin();
push_front(value_type(pTrack = t.release()));
auto n = begin();
pTrack->SetOwner(mSelf, n);
RecalcPositions(n);
ResizingEvent(n);
@@ -879,7 +854,7 @@ template<typename TrackKind>
Track *TrackList::Add(std::shared_ptr<TrackKind> &&t)
{
push_back(t);
auto n = ListOfTracks::end();
auto n = end();
--n;
t->SetOwner(mSelf, n);
RecalcPositions(n);
@@ -891,10 +866,9 @@ Track *TrackList::Add(std::shared_ptr<TrackKind> &&t)
template Track *TrackList::Add<Track>(std::shared_ptr<Track> &&);
template Track *TrackList::Add<WaveTrack>(std::shared_ptr<WaveTrack> &&);
auto TrackList::Replace(Track * t, ListOfTracks::value_type &&with) ->
ListOfTracks::value_type
auto TrackList::Replace(Track * t, value_type &&with) -> value_type
{
ListOfTracks::value_type holder;
value_type holder;
if (t && with) {
auto node = t->GetNode();
t->SetOwner({}, {});
@@ -914,13 +888,13 @@ auto TrackList::Replace(Track * t, ListOfTracks::value_type &&with) ->
TrackNodePointer TrackList::Remove(Track *t)
{
auto result = ListOfTracks::end();
TrackNodePointer result(end());
if (t) {
auto node = t->GetNode();
t->SetOwner({}, {});
if (!isNull(node)) {
ListOfTracks::value_type holder = std::move( *node );
value_type holder = std::move( *node );
result = erase(node);
if (!isNull(result)) {
@@ -1078,7 +1052,7 @@ void TrackList::SwapNodes(TrackNodePointer s1, TrackNodePointer s2)
}
// Remove tracks
ListOfTracks::value_type save11 = std::move(*s1), save12{};
value_type save11 = std::move(*s1), save12{};
s1 = erase(s1);
if (linked1) {
wxASSERT(s1 != s2);
@@ -1086,7 +1060,7 @@ void TrackList::SwapNodes(TrackNodePointer s1, TrackNodePointer s2)
}
const bool same = (s1 == s2);
ListOfTracks::value_type save21 = std::move(*s2), save22{};
value_type save21 = std::move(*s2), save22{};
s2 = erase(s2);
if (linked2)
save22 = std::move(*s2), s2 = erase(s2);
@@ -1138,7 +1112,9 @@ bool TrackList::MoveDown(Track * t)
bool TrackList::Contains(const Track * t) const
{
return make_iterator_range( *this ).contains( t );
return std::find_if(begin(), end(),
[=](const value_type &track) { return t == track.get(); }
) != end();
}
bool TrackList::IsEmpty() const
@@ -1160,12 +1136,12 @@ int TrackList::GetCount() const
TimeTrack *TrackList::GetTimeTrack()
{
auto iter = std::find_if(begin(), end(),
[] ( Track *t ) { return t->GetKind() == Track::Time; }
[] (const value_type &t) { return t->GetKind() == Track::Time; }
);
if (iter == end())
return nullptr;
else
return static_cast<TimeTrack*>(*iter);
return static_cast<TimeTrack*>(iter->get());
}
const TimeTrack *TrackList::GetTimeTrack() const
@@ -1238,7 +1214,7 @@ unsigned TrackList::GetNumExportChannels(bool selectionOnly) const
namespace {
template<typename Array>
Array GetWaveTracks(TrackListIterator p, const TrackListIterator end,
Array GetWaveTracks(ListOfTracks::const_iterator p, ListOfTracks::const_iterator end,
bool selectionOnly, bool includeMuted)
{
Array waveTrackArray;
@@ -1249,7 +1225,8 @@ namespace {
if (track->GetKind() == Track::Wave &&
(includeMuted || !wt->GetMute()) &&
(track->GetSelected() || !selectionOnly)) {
waveTrackArray.push_back( Track::Pointer< WaveTrack >( track ) );
waveTrackArray.push_back(
std::static_pointer_cast<WaveTrack>(track));
}
}
@@ -1264,9 +1241,7 @@ WaveTrackArray TrackList::GetWaveTrackArray(bool selectionOnly, bool includeMute
WaveTrackConstArray TrackList::GetWaveTrackConstArray(bool selectionOnly, bool includeMuted) const
{
auto list = const_cast<TrackList*>(this);
return GetWaveTracks<WaveTrackConstArray>(
list->begin(), list->end(), selectionOnly, includeMuted);
return GetWaveTracks<WaveTrackConstArray>(begin(), end(), selectionOnly, includeMuted);
}
#if defined(USE_MIDI)
@@ -1277,7 +1252,7 @@ NoteTrackArray TrackList::GetNoteTrackArray(bool selectionOnly)
for(const auto &track : *this) {
if (track->GetKind() == Track::Note &&
(track->GetSelected() || !selectionOnly)) {
noteTrackArray.push_back( Track::Pointer<NoteTrack>(track) );
noteTrackArray.push_back(std::static_pointer_cast<NoteTrack>(track));
}
}