Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00
Code Issues Releases Wiki Activity

Move AudacityProject::RemoveTrack

Browse Source
This commit is contained in:
Paul Licameli
2018-10-27 20:16:39 -04:00
parent 83f504e30f
commit 51c3541716
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/menus/TrackMenus.cpp
View File

@@ -575,6 +575,45 @@ void DoRemoveTracks( AudacityProject &project )
trackPanel->Refresh(false);
}
void DoRemoveTrack(AudacityProject &project, Track * toRemove)
{
auto &tracks = *project.GetTracks();
auto &trackPanel = *project.GetTrackPanel();
// If it was focused, then NEW focus is the next or, if
// unavailable, the previous track. (The NEW focus is set
// after the track has been removed.)
bool toRemoveWasFocused = trackPanel.GetFocusedTrack() == toRemove;
Track* newFocus{};
if (toRemoveWasFocused) {
auto iterNext = tracks.FindLeader(toRemove), iterPrev = iterNext;
newFocus = *++iterNext;
if (!newFocus) {
newFocus = *--iterPrev;
}
}
wxString name = toRemove->GetName();
auto channels = TrackList::Channels(toRemove);
// Be careful to post-increment over positions that get erased!
auto &iter = channels.first;
while (iter != channels.end())
tracks.Remove( * iter++ );
if (toRemoveWasFocused)
trackPanel.SetFocusedTrack(newFocus);
project.PushState(
wxString::Format(_("Removed track '%s.'"),
name),
_("Track Remove"));
project.FixScrollbars();
project.HandleResize();
trackPanel.Refresh(false);
}
void DoMoveTrack
(AudacityProject &project, Track* target, MoveChoice choice)
{
@@ -1229,7 +1268,7 @@ void OnTrackClose(const CommandContext &context)
return;
}
project.RemoveTrack(t);
DoRemoveTrack(project, t);
trackPanel->UpdateViewIfNoTracks();
trackPanel->Refresh(false);