Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-23 22:55:49 +01:00
Code Issues Releases Wiki Activity

Do without some friend declarations in LabelTrack...

Browse Source 
... and leave "updated" alone, it's only for use in interactive dragging
This commit is contained in:
Paul Licameli
2018-11-08 16:53:45 -05:00
parent 0750f62e88
commit 8ff5a4b345
5 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/commands/SetLabelCommand.cpp
View File

@@ -68,49 +68,50 @@ bool SetLabelCommand::Apply(const CommandContext & context)
AudacityProject * p = &context.project;
auto &tracks = TrackList::Get( *p );
auto &selectedRegion = ViewInfo::Get( *p ).selectedRegion;
LabelStruct * pLabel = NULL;
int i=0;
int nn=0;
LabelTrack *labelTrack {};
for (auto lt : tracks.Any<LabelTrack>()) {
if( i > mLabelIndex )
break;
labelTrack = lt;
for (nn = 0;
(nn< (int)labelTrack->mLabels.size()) && i<=mLabelIndex;
nn++) {
i++;
pLabel = &labelTrack->mLabels[nn];
const LabelStruct * pLabel = nullptr;
LabelTrack *labelTrack = nullptr;
auto ii = mLabelIndex;
if ( mLabelIndex >= 0 ) {
for (auto lt : tracks.Any<LabelTrack>()) {
const auto &labels = lt->GetLabels();
const auto nLabels = labels.size();
if( ii >= nLabels )
ii -= nLabels;
else {
labelTrack = lt;
pLabel = &labels[ ii ];
break;
}
}
}
if ( (i< mLabelIndex) || (pLabel == NULL))
if ( !pLabel )
{
context.Error(wxT("LabelIndex was invalid."));
return false;
}
auto newLabel = *pLabel;
if( bHasText )
pLabel->title = mText;
newLabel.title = mText;
if( bHasT0 )
pLabel->selectedRegion.setT0(mT0, false);
newLabel.selectedRegion.setT0(mT0, false);
if( bHasT1 )
pLabel->selectedRegion.setT1(mT1, false);
newLabel.selectedRegion.setT1(mT1, false);
if( bHasT0 || bHasT1 )
pLabel->selectedRegion.ensureOrdering();
pLabel->updated = true;
newLabel.selectedRegion.ensureOrdering();
labelTrack->SetLabel( ii, newLabel );
// Only one label can be selected.
if( bHasSelected ){
if( bHasSelected ) {
if( mbSelected )
{
labelTrack->mSelIndex = nn-1;
labelTrack->SetSelectedIndex( ii );
double t0 = pLabel->selectedRegion.t0();
double t1 = pLabel->selectedRegion.t1();
selectedRegion.setTimes( t0, t1);
}
else if( labelTrack->mSelIndex == (nn-1) )
labelTrack->mSelIndex = -1;
else if( labelTrack->GetSelectedIndex() == ii )
labelTrack->SetSelectedIndex( -1 );
}
labelTrack->SortLabels();