Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-16 03:15:27 +01:00
Code Issues Releases Wiki Activity

Revert "Preliminaries to support better interaction of undo and recording"

Browse Source 
This reverts commit 6e75ae58ac, reversing
changes made to 714d53e00f.
This commit is contained in:
Paul Licameli
2018-01-14 21:36:33 -05:00
parent 950898dcb9
commit 4ef8da8f16
15 changed files with 192 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/TrackArtist.cpp
View File

@@ -339,7 +339,8 @@ void TrackArtist::SetMargins(int left, int top, int right, int bottom)
}
void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
const std::function< Range() > &range,
TrackList * tracks,
Track * start,
const wxRegion & reg,
const wxRect & rect,
const wxRect & clip,
@@ -351,10 +352,11 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
{
wxRect trackRect = rect;
wxRect stereoTrackRect;
TrackListIterator iter(tracks);
Track *t;
bool hasSolo = false;
for (auto &track : range()) {
auto t = track.get();
for (t = iter.First(); t; t = iter.Next()) {
auto pt = dynamic_cast<const PlayableTrack *>(t);
if (pt && pt->GetSolo()) {
hasSolo = true;
@@ -377,8 +379,8 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
gPrefs->Read(wxT("/GUI/ShowTrackNameInWaveform"), &mbShowTrackNameInWaveform, false);
for (auto &track : range()) {
auto t = track.get();
t = iter.StartWith(start);
while (t) {
trackRect.y = t->GetY() - zoomInfo.vpos;
trackRect.height = t->GetHeight();
@@ -428,6 +430,8 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
selectedRegion, zoomInfo,
drawEnvelope, bigPoints, drawSliders, hasSolo);
}
t = iter.Next();
}
}