diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 09:34:39 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 09:34:39 -0400 |
| commit | ff46a3c3a216afc97fee0c796ac2eaa92d58becb (patch) | |
| tree | ae3c420e51a8f0ed54955014e593caffd33df9d0 /gtk2_ardour/region_view.cc | |
| parent | 88caf84b814593e7e34c7b81c77fb5c81b925aaa (diff) | |
| parent | 99f9b3456ab72d8172ce8296ed57417558ab73c7 (diff) | |
Merge branch 'canvasredesign' into cairocanvas
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index aee25b2e01..4a732b6360 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -63,7 +63,7 @@ static const int32_t sync_mark_width = 9; PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway; -RegionView::RegionView (ArdourCanvas::Group* parent, +RegionView::RegionView (ArdourCanvas::Layout* parent, TimeAxisView& tv, boost::shared_ptr<ARDOUR::Region> r, double spu, @@ -128,7 +128,7 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } -RegionView::RegionView (ArdourCanvas::Group* parent, +RegionView::RegionView (ArdourCanvas::Layout* parent, TimeAxisView& tv, boost::shared_ptr<ARDOUR::Region> r, double spu, |