diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
| commit | 30968b854257cb5f9159ca59589f783c85615601 (patch) | |
| tree | 81b105c877dd91745b5e06835cc063ad5d6d0a51 /gtk2_ardour/tempo_lines.cc | |
| parent | 44564654fd825f198946d0f189421f9e569f68a6 (diff) | |
| parent | cd6cbba29934bb8045640250e09325a5554d5cfe (diff) | |
merge with master, including manual merge conflict resolution
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
| -rw-r--r-- | gtk2_ardour/tempo_lines.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index 208ba4af13..9a9619c826 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -129,7 +129,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, //cout << endl << "*** LINE CACHE MISS" << endl; - bool inserted_last_time = true; bool invalidated = false; for (i = begin; i != end; ++i) { @@ -162,7 +161,7 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, ++li; line->set_outline_color (color); - inserted_last_time = false; // don't search next time + // Use existing line, moving if necessary } else if (!exhausted) { Lines::iterator steal = _lines.end(); @@ -178,7 +177,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, line->set_x1 (xpos); line->set_outline_color (color); _lines.insert(make_pair(xpos, line)); - inserted_last_time = true; // search next time invalidated = true; // Shift clean range left @@ -192,7 +190,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, //cout << "*** EXISTING LINE" << endl; li = existing; li->second->set_outline_color (color); - inserted_last_time = false; // don't search next time } else { //cout << "*** MOVING LINE" << endl; const double x1 = line->x0(); @@ -206,7 +203,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, line->set_x0 (xpos); line->set_x1 (xpos); _lines.insert(make_pair(xpos, line)); - inserted_last_time = true; // search next time } } @@ -222,7 +218,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, line->set_y1 (_height); line->set_outline_color (color); _lines.insert(make_pair(xpos, line)); - inserted_last_time = true; } // Steal from the left @@ -237,7 +232,6 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, line->set_x0 (xpos); line->set_x1 (xpos); _lines.insert(make_pair(xpos, line)); - inserted_last_time = true; // search next time invalidated = true; // Shift clean range right |