projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing include
[ardour.git]
/
gtk2_ardour
/
tempo_lines.h
diff --git
a/gtk2_ardour/tempo_lines.h
b/gtk2_ardour/tempo_lines.h
index 1ab71e0681e1194e42ca85f0dbc080935b1a1b0c..709602898177a39b0077d81e8d9c239854a75d40 100644
(file)
--- a/
gtk2_ardour/tempo_lines.h
+++ b/
gtk2_ardour/tempo_lines.h
@@
-19,42
+19,31
@@
#ifndef __ardour_tempo_lines_h__
#define __ardour_tempo_lines_h__
#ifndef __ardour_tempo_lines_h__
#define __ardour_tempo_lines_h__
-#include <map>
-#include <boost/pool/pool.hpp>
-#include <boost/pool/pool_alloc.hpp>
#include "ardour/tempo.h"
#include "ardour/tempo.h"
-#include "canvas.h"
-#include "simpleline.h"
-typedef boost::fast_pool_allocator<
- std::pair<const double, ArdourCanvas::SimpleLine*>,
- boost::default_user_allocator_new_delete,
- boost::details::pool::null_mutex,
- 8192>
- MapAllocator;
+#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);
void tempo_map_changed();
void tempo_map_changed();
- void draw(const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
- const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
- double frames_per_unit);
+ 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::map<double, ArdourCanvas::SimpleLine*, std::less<double>, MapAllocator> Lines;
- Lines _lines;
-
- ArdourCanvas::Canvas& _canvas;
- ArdourCanvas::Group* _group;
- double _clean_left;
- double _clean_right;
- double _height;
+ void draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+ unsigned divisions,
+ ARDOUR::framecnt_t leftmost_frame,
+ ARDOUR::framecnt_t frame_rate);
+
+ ArdourCanvas::LineSet lines;
};
#endif /* __ardour_tempo_lines_h__ */
};
#endif /* __ardour_tempo_lines_h__ */