correct placement of buffering adjustments w.r.t Butler thread creation

[ardour.git] / gtk2_ardour / tempo_lines.h

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index 275db7c85e23b86b7d032b1ad3c2a997c78ae216..048c56fd7efc0ab6bcfd9d1a9c5cc8a2d5a97857 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,40 +19,32 @@
 #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 "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:
-       TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
+       TempoLines (ArdourCanvas::Container* group, double screen_height);
 
        void tempo_map_changed();
 
-       void draw(ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit);
+       void draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
+                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
+                  unsigned                                              divisions,
+                  framecnt_t                                            leftmost_frame,
+                  framecnt_t                                            frame_rate);
 
        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 (const ARDOUR::TempoMap::BBTPointList::const_iterator& b,
+                        unsigned                                              divisions,
+                        framecnt_t                                            leftmost_frame,
+                        framecnt_t                                            frame_rate);
+
+       ArdourCanvas::LineSet lines;
 };
 
 #endif /* __ardour_tempo_lines_h__ */