Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Code Issues Releases Wiki Activity

GetSceenEndTime out of TrackPanel

Browse Source
This commit is contained in:
Paul Licameli
2019-06-21 12:14:46 -04:00
parent d29d10d712
commit 868481b686
9 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracks/ui/EditCursorOverlay.cpp
View File

@@ -90,15 +90,15 @@ void EditCursorOverlay::Draw(OverlayPanel &panel, wxDC &dc)
const auto &viewInfo = ViewInfo::Get( *mProject );
auto &trackPanel = TrackPanel::Get( *mProject );
const bool
onScreen = between_incexc(viewInfo.h,
mCursorTime,
trackPanel.GetScreenEndTime());
viewInfo.GetScreenEndTime());
if (!onScreen)
return;
auto &trackPanel = TrackPanel::Get( *mProject );
if (auto tp = dynamic_cast<TrackPanel*>(&panel)) {
wxASSERT(mIsMaster);
AColor::CursorColor(&dc);

6
src/tracks/ui/PlayIndicatorOverlay.cpp
View File

@@ -148,7 +148,6 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
ruler.AddOverlay( mPartner );
}
auto &trackPanel = TrackPanel::Get( *mProject );
const auto &viewInfo = ViewInfo::Get( *mProject );
auto width = viewInfo.GetTracksUsableWidth();
@@ -176,12 +175,11 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
// Use a small tolerance to avoid flicker of play head pinned all the way
// left or right
auto &trackPanel = TrackPanel::Get( *mProject );
const auto tolerance = pinned ? 1.5 * kTimerInterval / 1000.0 : 0;
bool onScreen = playPos >= 0.0 &&
between_incexc(viewInfo.h - tolerance,
playPos,
trackPanel.GetScreenEndTime() + tolerance);
viewInfo.GetScreenEndTime() + tolerance);
// This displays the audio time, too...
window.TP_DisplaySelection();
@@ -213,7 +211,7 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
onScreen = playPos >= 0.0 &&
between_incexc(viewInfo.h,
playPos,
trackPanel.GetScreenEndTime());
viewInfo.GetScreenEndTime());
}
}

4
src/tracks/ui/Scrubbing.cpp
View File

@@ -374,7 +374,7 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
auto delta = time0 - time1;
time0 = std::max(0.0, std::min(maxTime,
viewInfo.h +
(mProject->GetScreenEndTime() - viewInfo.h)
(viewInfo.GetScreenEndTime() - viewInfo.h)
* TracksPrefs::GetPinnedHeadPositionPreference()
));
time1 = time0 + delta;
@@ -820,7 +820,7 @@ double Scrubber::FindScrubSpeed(bool seeking, double time) const
{
auto &viewInfo = ViewInfo::Get( *mProject );
const double screen =
TrackPanel::Get( *mProject ).GetScreenEndTime() - viewInfo.h;
viewInfo.GetScreenEndTime() - viewInfo.h;
return (seeking ? FindSeekSpeed : FindScrubbingSpeed)
(viewInfo, mMaxSpeed, screen, time);
}