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

Rewrite append-record onto only the proper number of channels

Browse Source
This commit is contained in:
Paul Licameli
2018-04-07 22:36:43 -04:00
parent b60fae4470
commit 9fcccd32ac
1 changed files with 60 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/toolbars/ControlToolBar.cpp
View File

@@ -1020,13 +1020,9 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
} }
int recordingChannels = 0; int recordingChannels = 0;
// These count channels sellected/existing skipping tracks that
// are too big for the number of channels left. e.g don't count a stereo
// track when only one channel left to record.
int selectedChannels = 0;
int existingChannels = 0;
double allt0 = t0; double allt0 = t0;
WaveTrack *candidate{}, *selectedCandidate{};
if (appendRecord) { if (appendRecord) {
recordingChannels = gPrefs->Read(wxT("/AudioIO/RecordChannels"), 2); recordingChannels = gPrefs->Read(wxT("/AudioIO/RecordChannels"), 2);
@@ -1039,12 +1035,19 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
if (wt->GetEndTime() > allt0) { if (wt->GetEndTime() > allt0) {
allt0 = wt->GetEndTime(); allt0 = wt->GetEndTime();
} }
int nChannelsThisTrack = wt->GetLinked() ? 2:1; int nChannelsThisTrack = 1;
if( recordingChannels >= existingChannels + nChannelsThisTrack) if (wt->GetLink()) {
existingChannels += nChannelsThisTrack; if (wt->GetLinked())
if (tt->GetSelected()) { nChannelsThisTrack = 2;
if( recordingChannels >= selectedChannels + nChannelsThisTrack) else
selectedChannels += nChannelsThisTrack; continue;
}
if( recordingChannels == nChannelsThisTrack) {
candidate = wt;
if (wt->GetSelected())
selectedCandidate = wt;
}
if (wt->GetSelected()) {
if (wt->GetEndTime() > t0) { if (wt->GetEndTime() > t0) {
t0 = wt->GetEndTime(); t0 = wt->GetEndTime();
} }
@@ -1052,11 +1055,8 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
} }
} }
// Number of channels to record into is number selected, or all. // candidate null implies selectedCandidate also null
int nChannelsAvailable = ( selectedChannels > 0 ) ? selectedChannels : existingChannels; if( !candidate )
// If that is not enough to record without losing a channel, flip over to
// recording to new tracks.
if( nChannelsAvailable < recordingChannels )
appendRecord = false; appendRecord = false;
} }
@@ -1065,7 +1065,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
// t0 is now: max(selection-start, end-of-selected-wavetracks) // t0 is now: max(selection-start, end-of-selected-wavetracks)
// allt0 is: max(selection-start, end-of-all-tracks) // allt0 is: max(selection-start, end-of-all-tracks)
// Use end time of all wave tracks if none selected // Use end time of all wave tracks if none selected
if (selectedChannels == 0) { if (!selectedCandidate) {
t0 = allt0; t0 = allt0;
} }
@@ -1073,21 +1073,12 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
// Pad selected/all wave tracks to make them all the same length // Pad selected/all wave tracks to make them all the same length
// Remove recording tracks from the list of tracks for duplex ("overdub") // Remove recording tracks from the list of tracks for duplex ("overdub")
// playback. // playback.
for (Track *tt = it.First(); tt; tt = it.Next()) { auto tt = selectedCandidate ? selectedCandidate : candidate;
if (tt->GetKind() == Track::Wave && for (auto channel = tt; channel;
(tt->GetSelected() || channel = static_cast<WaveTrack*>(
(selectedChannels == 0) (channel->GetLinked()) ? channel->GetLink() : nullptr))
)) { {
auto wt = Track::Pointer<WaveTrack>(tt); auto wt = Track::Pointer<WaveTrack>(channel);
// Don't record into one track of a stereo track...
// We're in fact here refusing to record the last channel,
// if there are no more channels after it, into a stereo
// track - which comes to the same thing.
if( ((int)recordingTracks.size() >= recordingChannels -1) &&
wt->GetLinked() )
{ tt = it.Next();
continue;
}
if (duplex) { if (duplex) {
auto end = playbackTracks.end(); auto end = playbackTracks.end();
@@ -1127,11 +1118,6 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
pending->Paste(t1, newTrack.get()); pending->Paste(t1, newTrack.get());
} }
recordingTracks.push_back(pending); recordingTracks.push_back(pending);
// Don't record more channels than configured recording pref.
if( (int)recordingTracks.size() >= recordingChannels ){
break;
}
}
} }
if (t1 <= p->GetSel0() && p->GetSel1() > p->GetSel0()) { if (t1 <= p->GetSel0() && p->GetSel1() > p->GetSel0()) {