Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 09:20:16 +01:00
Code Issues Releases Wiki Activity

Rewrite some iterations over tracks and channels in TrackPanel

Browse Source
This commit is contained in:
Paul Licameli
2018-09-12 12:23:57 -04:00
parent aee4005044
commit 23a85893a1
5 changed files with 42 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/TrackPanelAx.cpp
View File

@@ -62,9 +62,7 @@ std::shared_ptr<Track> TrackPanelAx::GetFocus()
focusedTrack = FindTrack(mNumFocusedTrack);
}
if (!focusedTrack) {
TrackListIterator iter( mTrackPanel->GetTracks() );
focusedTrack = Track::Pointer( iter.First() );
focusedTrack = Track::Pointer( *mTrackPanel->GetTracks()->Any().first );
// only call SetFocus if the focus has changed to avoid
// unnecessary focus events
if (focusedTrack)
@@ -99,10 +97,7 @@ std::shared_ptr<Track> TrackPanelAx::SetFocus( std::shared_ptr<Track> track )
#endif
if( !track )
{
TrackListIterator iter( mTrackPanel->GetTracks() );
track = Track::Pointer( iter.First() );
}
track = Track::Pointer( *mTrackPanel->GetTracks()->Any().begin() );
mFocusedTrack = track;
mNumFocusedTrack = TrackNum(track);
@@ -252,24 +247,7 @@ wxAccStatus TrackPanelAx::GetChild( int childId, wxAccessible** child )
// Gets the number of children.
wxAccStatus TrackPanelAx::GetChildCount( int* childCount )
{
TrackListIterator iter( mTrackPanel->GetTracks() );
Track *t = iter.First();
int cnt = 0;
while( t != NULL )
{
cnt++;
if( t->GetLink() != NULL )
{
t = iter.Next();
}
t = iter.Next();
}
*childCount = cnt;
*childCount = mTrackPanel->GetTrackCount();
return wxACC_OK;
}