Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-29 08:43:56 +01:00
Code Issues Releases Wiki Activity

Iterators over TrackPanelCell give shared_ptr

Browse Source
This commit is contained in:
Paul Licameli
2017-06-26 16:53:12 -04:00
parent 58fea6d520
commit f8b74db76e
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/TrackPanel.cpp
View File

@@ -855,7 +855,7 @@ void TrackPanel::HandleCursor( wxMouseEvent *pEvent )
auto &rect = foundCell.rect;
auto &pCell = foundCell.pCell;
const auto size = GetSize();
const TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell };
const TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell.get() };
HandleCursor( tpmEvent );
}
@@ -1382,7 +1382,7 @@ try
auto &pTrack = foundCell.pTrack;
const auto size = GetSize();
TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell };
TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell.get() };
#if defined(__WXMAC__) && defined(EVT_MAGNIFY)
// PRL:
@@ -1461,7 +1461,8 @@ try
// UIHANDLE DRAG
const UIHandle::Result refreshResult =
mUIHandle->Drag( tpmEvent, GetProject() );
ProcessUIHandleResult(this, mRuler, mpClickedTrack, pTrack, refreshResult);
ProcessUIHandleResult
(this, mRuler, mpClickedTrack, pTrack.get(), refreshResult);
if (refreshResult & RefreshCode::Cancelled) {
// Drag decided to abort itself
mUIHandle = NULL;
@@ -1480,7 +1481,8 @@ try
mUIHandle = nullptr;
UIHandle::Result refreshResult =
uiHandle->Release( tpmEvent, GetProject(), this );
ProcessUIHandleResult(this, mRuler, mpClickedTrack, pTrack, refreshResult);
ProcessUIHandleResult
(this, mRuler, mpClickedTrack, pTrack.get(), refreshResult);
mpClickedTrack = NULL;
// will also Uncapture() below
}
@@ -1508,7 +1510,7 @@ try
const auto foundCell = FindCell(event.m_x, event.m_y);
auto t = foundCell.pTrack;
if ( t )
EnsureVisible(t);
EnsureVisible(t.get());
}
}
catch( ... )
@@ -2511,7 +2513,8 @@ TrackPanel::FoundCell TrackPanel::FindCell(int mouseX, int mouseY)
iter = prev;
auto found = *iter;
return {
static_cast<CommonTrackPanelCell*>( found.first )->FindTrack(),
Track::Pointer(
static_cast<CommonTrackPanelCell*>( found.first.get() )->FindTrack() ),
found.first,
found.second
};
@@ -3085,12 +3088,15 @@ IteratorRange< TrackPanelCellIterator > TrackPanel::Cells()
TrackPanelCellIterator::TrackPanelCellIterator(TrackPanel *trackPanel, bool begin)
: mPanel{ trackPanel }
, mIter{ trackPanel->GetProject() }
, mpTrack{ begin ? mIter.First() : nullptr }
, mpCell{ begin
? ( mpTrack ? mpTrack : trackPanel->GetBackgroundCell().get() )
: nullptr
}
{
if (begin) {
mpTrack = Track::Pointer( mIter.First() );
if (mpTrack)
mpCell = mpTrack;
else
mpCell = trackPanel->GetBackgroundCell();
}
const auto size = mPanel->GetSize();
mRect = { 0, 0, size.x, size.y };
UpdateRect();
@@ -3100,7 +3106,7 @@ TrackPanelCellIterator &TrackPanelCellIterator::operator++ ()
{
if ( mpTrack ) {
if ( ++ mType == CellType::Background )
mType = CellType::Track, mpTrack = mIter.Next();
mType = CellType::Track, mpTrack = Track::Pointer( mIter.Next() );
}
if ( mpTrack ) {
if ( mType == CellType::Label &&
@@ -3112,25 +3118,25 @@ TrackPanelCellIterator &TrackPanelCellIterator::operator++ ()
mpCell = mpTrack;
break;
case CellType::Label:
mpCell = mpTrack->GetTrackControl().get();
mpCell = mpTrack->GetTrackControl();
break;
case CellType::VRuler:
mpCell = mpTrack->GetVRulerControl().get();
mpCell = mpTrack->GetVRulerControl();
break;
case CellType::Resizer: {
mpCell = mpTrack->GetResizer().get();
mpCell = mpTrack->GetResizer();
break;
}
default:
// should not happen
mpCell = nullptr;
mpCell.reset();
break;
}
}
else if ( !mDidBackground )
mpCell = mPanel->GetBackgroundCell().get(), mDidBackground = true;
mpCell = mPanel->GetBackgroundCell(), mDidBackground = true;
else
mpCell = nullptr;
mpCell.reset();
UpdateRect();