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/automation_streamview.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/automation_streamview.cc')
| -rw-r--r-- | gtk2_ardour/automation_streamview.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index 86fd695e07..1654e7e5a9 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -52,16 +52,16 @@ using namespace ARDOUR; using namespace PBD; using namespace Editing; -AutomationStreamView::AutomationStreamView (AutomationTimeAxisViewPtr tv) - : StreamView (boost::dynamic_pointer_cast<RouteTimeAxisView> (tv->get_parent()), - new ArdourCanvas::Group(*tv->canvas_display())) - , _controller(tv->controller()) +AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv) + : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()), + new ArdourCanvas::Group(*tv.canvas_display())) + , _controller(tv.controller()) , _automation_view(tv) { //canvas_rect->property_fill_color_rgba() = stream_base_color; canvas_rect->property_outline_color_rgba() = RGBA_BLACK; - use_rec_regions = tv->editor().show_waveforms_recording (); + use_rec_regions = tv.editor().show_waveforms_recording (); } AutomationStreamView::~AutomationStreamView () @@ -165,8 +165,8 @@ AutomationStreamView::redisplay_diskstream () } // Add and display region views, and flag them as valid - if (_trackview->is_track()) { - _trackview->get_diskstream()->playlist()->foreach_region ( + if (_trackview.is_track()) { + _trackview.get_diskstream()->playlist()->foreach_region ( sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) ); } @@ -199,11 +199,11 @@ AutomationStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t void AutomationStreamView::color_handler () { - /*if (_trackview->is_midi_track()) { + /*if (_trackview.is_midi_track()) { canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); } - if (!_trackview->is_midi_track()) { + if (!_trackview.is_midi_track()) { canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();; }*/ } |