add Group::clear(), do not clear _canvas member of Item when unparented (only the parent is changed)

1 files changed, 6 insertions, 16 deletions

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index a0c7650516..f4ee293e29 100644
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -19,39 +19,29 @@
 #ifndef __ardour_tempo_lines_h__
 #define __ardour_tempo_lines_h__
 
-#include <map>
-#include <boost/pool/pool.hpp>
-#include <boost/pool/pool_alloc.hpp>
+#include <list>
 #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;
-
 class TempoLines {
 public:
 	TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
 
 	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 (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
+		   const ARDOUR::TempoMap::BBTPointList::const_iterator& end, 
+		   double frames_per_unit);
 
 	void show();
 	void hide();
 
 private:
-	typedef std::map<double, ArdourCanvas::Line*, std::less<double>, MapAllocator> Lines;
+        typedef std::list<ArdourCanvas::Line*> Lines;
 	Lines _lines;
+        Lines _cache;
 
         ArdourCanvas::Canvas& _canvas;
 	ArdourCanvas::Group*  _group;
-	double                _clean_left;
-	double                _clean_right;
 	double                _height;
 };