diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /gtk2_ardour/region_view.h | |
parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.h')
-rw-r--r-- | gtk2_ardour/region_view.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index a83010c490..19d13ccf03 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -48,6 +48,7 @@ class RegionView : public TimeAxisViewItem Gdk::Color& basic_color); RegionView (const RegionView& other); + RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region); ~RegionView (); @@ -135,6 +136,7 @@ class RegionView : public TimeAxisViewItem bool valid; ///< see StreamView::redisplay_diskstream() bool _enable_display; ///< see StreamView::redisplay_diskstream() double _pixel_width; + double _height; bool in_destructor; bool wait_for_data; |