mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / tempo_lines.h

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index defe07226c0c8a4016816f1efb0555f4fe778db8..158ef7b1f96504f6ed4b0e9494de8815efb5c71d 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -19,40 +19,34 @@
 #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/beats_frames_converter.h"
 #include "ardour/tempo.h"
 
-typedef boost::fast_pool_allocator<
-               std::pair<const double, ArdourCanvas::Line*>,
-               boost::default_user_allocator_new_delete,
-               boost::details::pool::null_mutex,
-               8192>
-       MapAllocator;
+#include "canvas/line_set.h"
 
 class TempoLines {
 public:
-       TempoLines(ArdourCanvas::GtkCanvasViewport& 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, 
-                 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:
-       typedef std::map<double, ArdourCanvas::Line*, std::less<double>, MapAllocator> Lines;
-       Lines _lines;
-
-        ArdourCanvas::GtkCanvasViewport& _canvas_viewport;
-       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;
+       ARDOUR::BeatsFramesConverter* _bfc;
 };
 
 #endif /* __ardour_tempo_lines_h__ */