X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_lines.h;h=5d1d7d71faacd59d404bde770b8baae9900802b6;hb=b94c9ef8e09d41c28e44baae36e67bdf06e3758e;hp=83c71849c2e5de957663319d5ffefd86a1e3930f;hpb=a8baa20be8fd65299e843611eb8bb90443806da8;p=ardour.git

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index 83c71849c2..5d1d7d71fa 100644
--- 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,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/tempo.h>
-#include "canvas.h"
-#include "simpleline.h"
+#include "ardour/beats_samples_converter.h"
+#include "ardour/tempo.h"
 
-typedef boost::fast_pool_allocator<
-		std::pair<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, ARDOUR::BeatsSamplesConverter* bfc);
+	~TempoLines ();
 
-	void tempo_map_changed();
+	void tempo_map_changed(samplepos_t new_origin);
 
-	void draw(ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit);
+	void draw (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+		   unsigned                                              divisions,
+	           ARDOUR::samplecnt_t                                    leftmost_sample,
+	           ARDOUR::samplecnt_t                                    sample_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 (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
+			 unsigned                                              divisions,
+	                 ARDOUR::samplecnt_t                                    leftmost_sample,
+	                 ARDOUR::samplecnt_t                                    sample_rate);
+
+	ArdourCanvas::LineSet lines;
+	ARDOUR::BeatsSamplesConverter* _bfc;
 };
 
 #endif /* __ardour_tempo_lines_h__ */