Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-18 17:10:05 +02:00
Code Issues Releases Wiki Activity

Clean up conflict markers in commented-out code

Browse Source
This commit is contained in:
Paul Licameli 2016-07-10 15:37:32 -04:00
commit c8d5905bd3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/LabelTrack.cpp
View File

@ -182,17 +182,8 @@ bool LabelTrack::Clear(double b, double e)
bool LabelTrack::SplitDelete(double b, double e) bool LabelTrack::SplitDelete(double b, double e)
{ {
// May delete labels, so use subscripts to iterate // May delete labels, so use subscripts to iterate
<<<<<<< HEAD
for (size_t i = 0, len = mLabels.size(); i < len; ++i) { for (size_t i = 0, len = mLabels.size(); i < len; ++i) {
<<<<<<< HEAD
auto &labelStruct = *mLabels[i];
=======
for (size_t i = 0; i < mLabels.size(); ++i) {
auto &labelStruct = mLabels[i]; auto &labelStruct = mLabels[i];
>>>>>>> 1352006... fix
=======
auto &labelStruct = mLabels[i];
>>>>>>> d6970df... Put labels directly in a vector, not pointers to them...
LabelStruct::TimeRelations relation = LabelStruct::TimeRelations relation =
labelStruct.RegionRelation(b, e, this); labelStruct.RegionRelation(b, e, this);
if (relation == LabelStruct::SURROUNDS_LABEL) { if (relation == LabelStruct::SURROUNDS_LABEL) {