diff options
| author | David Robillard <d@drobilla.net> | 2008-09-23 14:36:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-23 14:36:26 +0000 |
| commit | 22dc575e4cbc35a5d486d6f448332fb721865d57 (patch) | |
| tree | a82540280327989dae4ccdebf359c4688b126563 /gtk2_ardour/tempo_lines.cc | |
| parent | ffaf827d93e56052049fc00234283842564821d5 (diff) | |
Fix merge regression: use TempoLines class instead of same built in to editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@3795 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
| -rw-r--r-- | gtk2_ardour/tempo_lines.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index daaa2dcd34..c234cb4c51 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -22,7 +22,6 @@ #include "tempo_lines.h" #include "ardour_ui.h" - ArdourCanvas::SimpleLine * TempoLines::get_line () { @@ -68,10 +67,6 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit _canvas.get_scroll_region (x1, y1, x2, who_cares); _canvas.root()->get_bounds(who_cares, who_cares, who_cares, y2); - // FIXME use canvas height - //y2 = TimeAxisView::hLargest*5000; // five thousand largest tracks should be enough.. :) - //y2 = 500000; // five thousand largest tracks should be enough.. :) - /* get the first bar spacing */ i = points.end(); @@ -86,7 +81,7 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit */ return; } - + for (i = points.begin(); i != points.end(); ++i) { switch ((*i).type) { @@ -107,7 +102,7 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit } } - xpos = rint((*i).frame / (double)frames_per_unit); + xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit); line = get_line (); line->property_x1() = xpos; line->property_x2() = xpos; @@ -119,4 +114,3 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit } } } - |