Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-13 16:15:48 +01:00
Code Issues Releases Wiki Activity

Simplify append-record code using TrackList copy and move

Browse Source
This commit is contained in:
Paul Licameli
2016-02-26 19:30:12 -05:00
parent cd8a19f055
commit eead25872e
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/toolbars/ControlToolBar.cpp
View File

@@ -799,8 +799,8 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
SetRecord(true, mRecord->WasShiftDown()); SetRecord(true, mRecord->WasShiftDown());
if (p) { if (p) {
TrackList *t = p->GetTracks(); TrackList *trackList = p->GetTracks();
TrackListIterator it(t); TrackListIterator it(trackList);
if(it.First() == NULL) if(it.First() == NULL)
mRecord->SetShift(false); mRecord->SetShift(false);
double t0 = p->GetSel0(); double t0 = p->GetSel0();
@@ -818,7 +818,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
gPrefs->Read(wxT("/AudioIO/Duplex"), &duplex, true); gPrefs->Read(wxT("/AudioIO/Duplex"), &duplex, true);
if(duplex){ if(duplex){
playbackTracks = t->GetWaveTrackArray(false); playbackTracks = trackList->GetWaveTrackArray(false);
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
midiTracks = t->GetNoteTrackArray(false); midiTracks = t->GetNoteTrackArray(false);
#endif #endif
@@ -832,7 +832,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
// If SHIFT key was down, the user wants append to tracks // If SHIFT key was down, the user wants append to tracks
int recordingChannels = 0; int recordingChannels = 0;
TrackList tracksCopy(true); TrackList tracksCopy{};
bool tracksCopied = false; bool tracksCopied = false;
bool shifted = mRecord->WasShiftDown(); bool shifted = mRecord->WasShiftDown();
if (shifted) { if (shifted) {
@@ -879,12 +879,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
if (t1 < t0) { if (t1 < t0) {
if (!tracksCopied) { if (!tracksCopied) {
tracksCopied = true; tracksCopied = true;
TrackListIterator iter(t); tracksCopy = *trackList;
Track *trk = iter.First();
while (trk) {
tracksCopy.Add(trk->Duplicate());
trk = iter.Next();
}
} }
WaveTrack *newTrack = p->GetTrackFactory()->NewWaveTrack(); WaveTrack *newTrack = p->GetTrackFactory()->NewWaveTrack();
@@ -985,7 +980,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
// we add the tracks where recording is done into now. We remove them // we add the tracks where recording is done into now. We remove them
// later if starting the stream fails // later if starting the stream fails
for (unsigned int i = 0; i < newRecordingTracks.size(); i++) for (unsigned int i = 0; i < newRecordingTracks.size(); i++)
t->Add(newRecordingTracks[i]); trackList->Add(newRecordingTracks[i]);
} }
//Automated Input Level Adjustment Initialization //Automated Input Level Adjustment Initialization
@@ -1010,22 +1005,13 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
else { else {
if (shifted) { if (shifted) {
// Restore the tracks to remove any inserted silence // Restore the tracks to remove any inserted silence
if (tracksCopied) { if (tracksCopied)
t->Clear(true); *trackList = std::move(tracksCopy);
TrackListIterator iter(&tracksCopy);
Track *trk = iter.First();
while (trk)
{
Track *tmp = trk;
trk = iter.RemoveCurrent();
t->Add(tmp);
}
}
} }
else { else {
// msmeyer: Delete recently added tracks if opening stream fails // msmeyer: Delete recently added tracks if opening stream fails
for (unsigned int i = 0; i < newRecordingTracks.size(); i++) { for (unsigned int i = 0; i < newRecordingTracks.size(); i++) {
t->Remove(newRecordingTracks[i]); trackList->Remove(newRecordingTracks[i]);
delete newRecordingTracks[i]; delete newRecordingTracks[i];
} }
} }