diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
| commit | 402cc384ced6cb152c8abe4294009fe0de0a6dea (patch) | |
| tree | f01db6b412cb8e2d3c69fa123fd615c229ee47d3 /gtk2_ardour/crossfade_view.cc | |
| parent | cc351b97a986fca48a6b3b631a292bf24efc5e41 (diff) | |
Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/crossfade_view.cc')
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 8f8649daf2..63c2115b87 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -43,7 +43,7 @@ using namespace Canvas; sigc::signal<void,CrossfadeView*> CrossfadeView::GoingAway; CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, - RouteTimeAxisViewPtr tv, + RouteTimeAxisView &tv, boost::shared_ptr<Crossfade> xf, double spu, Gdk::Color& basic_color, @@ -69,7 +69,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; - set_height (get_time_axis_view()->current_height()); + set_height (get_time_axis_view().current_height()); /* no frame around the xfade or overlap rects */ @@ -80,7 +80,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, vestigial_frame->hide(); show_vestigial = false; - group->signal_event().connect (bind (mem_fun (tv->editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); + group->signal_event().connect (bind (mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); crossfade_changed (Change (~0)); @@ -161,7 +161,7 @@ CrossfadeView::redraw_curves () track is either Small or Smaller. */ - double tav_height = get_time_axis_view()->current_height(); + double tav_height = get_time_axis_view().current_height(); if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) { h = tav_height - 3.0; @@ -174,7 +174,7 @@ CrossfadeView::redraw_curves () return; } - npoints = get_time_axis_view()->editor().frame_to_pixel (crossfade->length()); + npoints = get_time_axis_view().editor().frame_to_pixel (crossfade->length()); // npoints = std::min (gdk_screen_width(), npoints); if (!_visible || !crossfade->active() || npoints < 3) { |