projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
[ardour.git]
/
gtk2_ardour
/
tempo_lines.cc
diff --git
a/gtk2_ardour/tempo_lines.cc
b/gtk2_ardour/tempo_lines.cc
index d73fb54b81309b04b1f330ed1d572f3c959948de..828a4cc82ba8a390af7b320bfcf37d4c8663319b 100644
(file)
--- a/
gtk2_ardour/tempo_lines.cc
+++ b/
gtk2_ardour/tempo_lines.cc
@@
-17,18
+17,22
@@
*/
*/
+#include "pbd/compose.h"
+
#include "canvas/line.h"
#include "canvas/canvas.h"
#include "canvas/debug.h"
#include "canvas/line.h"
#include "canvas/canvas.h"
#include "canvas/debug.h"
+
#include "tempo_lines.h"
#include "ardour_ui.h"
#include "tempo_lines.h"
#include "ardour_ui.h"
+#include "public_editor.h"
using namespace std;
using namespace std;
-TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double
screen_height
)
+TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double
h
)
: _canvas (canvas)
, _group (group)
: _canvas (canvas)
, _group (group)
- , _height (
screen_height
)
+ , _height (
h
)
{
}
{
}
@@
-58,8
+62,7
@@
TempoLines::hide ()
void
TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
void
TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
- const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
- double samples_per_pixel)
+ const ARDOUR::TempoMap::BBTPointList::const_iterator& end)
{
ARDOUR::TempoMap::BBTPointList::const_iterator i;
ArdourCanvas::Rect const visible = _canvas.visible_area ();
{
ARDOUR::TempoMap::BBTPointList::const_iterator i;
ArdourCanvas::Rect const visible = _canvas.visible_area ();
@@
-97,7
+100,7
@@
TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
}
color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
}
- ArdourCanvas::Coord xpos =
rint(((framepos_t)(*i).frame) / (double)samples_per_pixel
);
+ ArdourCanvas::Coord xpos =
PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame
);
ArdourCanvas::Line* line;
ArdourCanvas::Line* line;
@@
-107,7
+110,7
@@
TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
line->reparent (_group);
} else {
line = new ArdourCanvas::Line (_group);
line->reparent (_group);
} else {
line = new ArdourCanvas::Line (_group);
- CANVAS_DEBUG_NAME (line,
"tempo measure line"
);
+ CANVAS_DEBUG_NAME (line,
string_compose ("tempo measure line @ %1", (*i).frame)
);
line->set_ignore_events (true);
}
line->set_ignore_events (true);
}