projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix thinko in dd3f922788
[ardour.git]
/
gtk2_ardour
/
tempo_lines.h
diff --git
a/gtk2_ardour/tempo_lines.h
b/gtk2_ardour/tempo_lines.h
index 912a77aea2cbd0795b8cf3d640eae8c702f6edb4..158ef7b1f96504f6ed4b0e9494de8815efb5c71d 100644
(file)
--- a/
gtk2_ardour/tempo_lines.h
+++ b/
gtk2_ardour/tempo_lines.h
@@
-19,29
+19,34
@@
#ifndef __ardour_tempo_lines_h__
#define __ardour_tempo_lines_h__
#ifndef __ardour_tempo_lines_h__
#define __ardour_tempo_lines_h__
-#include
<list>
+#include
"ardour/beats_frames_converter.h"
#include "ardour/tempo.h"
#include "ardour/tempo.h"
+#include "canvas/line_set.h"
+
class TempoLines {
public:
class TempoLines {
public:
- TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
+ TempoLines (ArdourCanvas::Container* group, double screen_height, ARDOUR::BeatsFramesConverter* bfc);
+ ~TempoLines ();
- void tempo_map_changed();
+ void tempo_map_changed(
framepos_t new_origin
);
- void draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
- const ARDOUR::TempoMap::BBTPointList::const_iterator& end);
+ void draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+ unsigned divisions,
+ ARDOUR::framecnt_t leftmost_frame,
+ ARDOUR::framecnt_t frame_rate);
void show();
void hide();
private:
void show();
void hide();
private:
- typedef std::list<ArdourCanvas::Line*> Lines;
- Lines _lines;
- Lines _cache;
+ void draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+ unsigned divisions,
+ ARDOUR::framecnt_t leftmost_frame,
+ ARDOUR::framecnt_t frame_rate);
- ArdourCanvas::Canvas& _canvas;
- ArdourCanvas::Group* _group;
- double _height;
+ ArdourCanvas::LineSet lines;
+ ARDOUR::BeatsFramesConverter* _bfc;
};
#endif /* __ardour_tempo_lines_h__ */
};
#endif /* __ardour_tempo_lines_h__ */