From 5c454c5a741bb70b4e39b0ccc2f93b59fe738a4b Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Wed, 30 Nov 2011 23:56:34 +0000 Subject: [PATCH] Comment out unused AudacityProject::OnSplitLabelsToTracks(). --- src/Menus.cpp | 156 +++++++++++++++++++++++++------------------------- src/Menus.h | 2 +- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/Menus.cpp b/src/Menus.cpp index 23ec49d4d..59afa0490 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -4113,84 +4113,84 @@ void AudacityProject::OnSplitNew() RedrawProject(); } -void AudacityProject::OnSplitLabelsToTracks() -{ - TrackListIterator iter(mTracks); - - Track *n = iter.First(); - Track *srcRight = 0; - Track *srcLeft = 0; - bool stereo = false; - LabelTrack *label = 0; - - while(n) { - if(n->GetSelected()) { - if(n->GetKind() == Track::Wave) { - if(n->GetLinked() == true) { - stereo = true; - srcLeft = n; - srcRight = iter.Next(); - } - else { - srcRight = n; - stereo = false; - } - } - else if(n->GetKind() == Track::Label) - label = (LabelTrack*)n; // cast necessary to call LabelTrack specific methods - } - n = iter.Next(); - } - - wxASSERT(label); // per Vigilant Sentry report on possible null deref, FIX-ME: Report error or validate? - for(int i = 0; i < label->GetNumLabels(); i++) { - wxString name = label->GetLabel(i)->title; - double begin = label->GetLabel(i)->t; - double end; - - // if on the last label, extend to the end of the wavetrack - if(i == label->GetNumLabels() - 1) { - if(stereo) - end = wxMax(srcLeft->GetEndTime(), srcRight->GetEndTime()); - else - end = srcLeft->GetEndTime(); - } - else - end = label->GetLabel(i+1)->t; - - Track *destLeft = 0; - Track *destRight = 0; - - srcLeft->Copy(begin, end, &destLeft); - if (destLeft) { - destLeft->Init(*srcLeft); - destLeft->SetOffset(wxMax(begin, srcLeft->GetOffset())); - destLeft->SetName(name); - - mTracks->Add(destLeft); - } - - if(stereo) { - srcRight->Copy(begin, end, &destRight); - if (destRight) { - destRight->Init(*srcRight); - destRight->SetOffset(wxMax(begin, srcRight->GetOffset())); - destRight->SetName(name); - - mTracks->Add(destRight); - } - else if(destLeft) - // account for possibility of a non-aligned linked track, which could - // cause the left channel to be eligible for creating a new track, - // but not the right. - destLeft->SetLinked(false); - } - } - - PushState(_("Split at labels"), _("Split at labels")); - - RedrawProject(); -} +//void AudacityProject::OnSplitLabelsToTracks() +//{ +// TrackListIterator iter(mTracks); +// +// Track *n = iter.First(); +// Track *srcRight = 0; +// Track *srcLeft = 0; +// bool stereo = false; +// LabelTrack *label = 0; +// +// while(n) { +// if(n->GetSelected()) { +// if(n->GetKind() == Track::Wave) { +// if(n->GetLinked() == true) { +// stereo = true; +// srcLeft = n; +// srcRight = iter.Next(); +// } +// else { +// srcRight = n; +// stereo = false; +// } +// } +// else if(n->GetKind() == Track::Label) +// label = (LabelTrack*)n; // cast necessary to call LabelTrack specific methods +// } +// n = iter.Next(); +// } +// +// wxASSERT(label); // per Vigilant Sentry report on possible null deref, FIX-ME: Report error or validate? +// for(int i = 0; i < label->GetNumLabels(); i++) { +// wxString name = label->GetLabel(i)->title; +// double begin = label->GetLabel(i)->t; +// double end; +// +// // if on the last label, extend to the end of the wavetrack +// if(i == label->GetNumLabels() - 1) { +// if(stereo) +// end = wxMax(srcLeft->GetEndTime(), srcRight->GetEndTime()); +// else +// end = srcLeft->GetEndTime(); +// } +// else +// end = label->GetLabel(i+1)->t; +// +// Track *destLeft = 0; +// Track *destRight = 0; +// +// srcLeft->Copy(begin, end, &destLeft); +// if (destLeft) { +// destLeft->Init(*srcLeft); +// destLeft->SetOffset(wxMax(begin, srcLeft->GetOffset())); +// destLeft->SetName(name); +// +// mTracks->Add(destLeft); +// } +// +// if(stereo) { +// srcRight->Copy(begin, end, &destRight); +// if (destRight) { +// destRight->Init(*srcRight); +// destRight->SetOffset(wxMax(begin, srcRight->GetOffset())); +// destRight->SetName(name); +// +// mTracks->Add(destRight); +// } +// else if(destLeft) +// // account for possibility of a non-aligned linked track, which could +// // cause the left channel to be eligible for creating a new track, +// // but not the right. +// destLeft->SetLinked(false); +// } +// } +// +// PushState(_("Split at labels"), _("Split at labels")); +// +// RedrawProject(); +//} void AudacityProject::OnSelectAll() { diff --git a/src/Menus.h b/src/Menus.h index db503054d..bf775b5da 100644 --- a/src/Menus.h +++ b/src/Menus.h @@ -225,7 +225,7 @@ void OnSilence(); void OnSplit(); void OnSplitNew(); -void OnSplitLabelsToTracks(); +// void OnSplitLabelsToTracks(); void OnJoin(); void OnDisjoin(); void OnDuplicate();