Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-04 14:19:30 +02:00
Code Issues Releases Wiki Activity

Restore tracks if recording fails to start

Browse Source 
During an append record, silence may need to be added to the
end of the existing track(s) to fill any gap between the end
and the common recording start time.

But, if the recording fails to start, this silence is left at
the ends of the tracks.

This change fixes that by making a copy of the tracks before
recording starts and restoring the tracks from that copy if
the start fails.
This commit is contained in:
Leland Lucius 2015-04-17 16:31:01 -05:00
parent c38d863158
commit 69b044e321
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/toolbars/ControlToolBar.cpp
View File

@ -819,6 +819,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 = NULL;
bool shifted = mRecord->WasShiftDown(); bool shifted = mRecord->WasShiftDown();
if (shifted) { if (shifted) {
bool sel = false; bool sel = false;
@ -858,6 +859,16 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
playbackTracks.Remove(wt); playbackTracks.Remove(wt);
t1 = wt->GetEndTime(); t1 = wt->GetEndTime();
if (t1 < t0) { if (t1 < t0) {
if (!tracksCopy) {
tracksCopy = new TrackList();
TrackListIterator iter(t);
Track *trk = iter.First();
while (trk) {
tracksCopy->Add(trk->Duplicate());
trk = iter.Next();
}
}
WaveTrack *newTrack = p->GetTrackFactory()->NewWaveTrack(); WaveTrack *newTrack = p->GetTrackFactory()->NewWaveTrack();
newTrack->InsertSilence(0.0, t0 - t1); newTrack->InsertSilence(0.0, t0 - t1);
newTrack->Flush(); newTrack->Flush();
@ -923,10 +934,29 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
if (success) { if (success) {
p->SetAudioIOToken(token); p->SetAudioIOToken(token);
mBusyProject = p; mBusyProject = p;
if (shifted && tracksCopy) {
tracksCopy->Clear(true);
delete tracksCopy;
}
}
else {
if (shifted) {
// Restore the tracks to remove any inserted silence
if (tracksCopy) {
t->Clear(true);
TrackListIterator iter(tracksCopy);
Track *trk = iter.First();
while (trk)
{
Track *tmp = trk;
trk = iter.RemoveCurrent();
t->Add(tmp);
}
delete tracksCopy;
}
} }
else { else {
// msmeyer: Delete recently added tracks if opening stream fails // msmeyer: Delete recently added tracks if opening stream fails
if (!shifted) {
for (unsigned int i = 0; i < newRecordingTracks.GetCount(); i++) { for (unsigned int i = 0; i < newRecordingTracks.GetCount(); i++) {
t->Remove(newRecordingTracks[i]); t->Remove(newRecordingTracks[i]);
delete newRecordingTracks[i]; delete newRecordingTracks[i];