diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-23 02:42:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-23 02:42:37 +0000 |
| commit | 88f13bbe33f8cb24fc571eb65538ad8896d272e0 (patch) | |
| tree | f5c7cd169f9ecdc7f73ecb7652858f662362d62c /gtk2_ardour/streamview.h | |
| parent | 5779060c7f6a0ee71e64cdf10ef19843298ab699 (diff) | |
Revert my rev. 7140 and fix it better.
git-svn-id: svn://localhost/ardour2/branches/3.0@7145 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
| -rw-r--r-- | gtk2_ardour/streamview.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 14b30a42fc..0bf770837f 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -77,7 +77,7 @@ public: LayerDisplay layer_display () const { return _layer_display; } ArdourCanvas::Group* background_group() { return _background_group; } - ArdourCanvas::Group* canvas_item() { return canvas_group; } + ArdourCanvas::Group* canvas_item() { return _canvas_group; } enum ColorTarget { RegionColor, @@ -116,7 +116,7 @@ public: sigc::signal<void> HeightChanged; protected: - StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL); + StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0); void transport_changed(); void transport_looped(); @@ -140,9 +140,10 @@ protected: virtual void color_handler () = 0; RouteTimeAxisView& _trackview; + bool owns_background_group; bool owns_canvas_group; ArdourCanvas::Group* _background_group; - ArdourCanvas::Group* canvas_group; + ArdourCanvas::Group* _canvas_group; ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */ typedef std::list<RegionView* > RegionViewList; |