From fca81c9a6a591b6f94223454a981d919c9ad51a5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 21 Apr 2013 13:10:27 -0400 Subject: add Group::clear(), do not clear _canvas member of Item when unparented (only the parent is changed) --- gtk2_ardour/tempo_lines.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'gtk2_ardour/tempo_lines.h') 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 -#include -#include +#include #include "ardour/tempo.h" -typedef boost::fast_pool_allocator< - std::pair, - 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, MapAllocator> Lines; + typedef std::list Lines; Lines _lines; + Lines _cache; ArdourCanvas::Canvas& _canvas; ArdourCanvas::Group* _group; - double _clean_left; - double _clean_right; double _height; }; -- cgit v1.2.3