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/midi_time_axis.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/midi_time_axis.cc')
-rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 9dd23d5658..c8cd5fe464 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -89,7 +89,7 @@ static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 162; static const uint32_t KEYBOARD_MIN_HEIGHT = 140; MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, - boost::shared_ptr<Route> rt, Canvas& canvas) + boost::shared_ptr<Route> rt, Canvas& canvas) : AxisView(sess) // virtually inherited , RouteTimeAxisView(ed, sess, rt, canvas) , _ignore_signals(false) @@ -103,27 +103,9 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, , _channel_color_mode_item(0) , _track_color_mode_item(0) { - -} - - -MidiTimeAxisViewPtr -MidiTimeAxisView::create (PublicEditor& ed, Session& sess, - boost::shared_ptr<Route> rt, Canvas& canvas) -{ - MidiTimeAxisViewPtr v (new MidiTimeAxisView (ed, sess, rt, canvas)); - v->init (ed, sess, rt, canvas); - return v; -} - - -void -MidiTimeAxisView::init (PublicEditor& ed, Session& sess, - boost::shared_ptr<Route> rt, Canvas& canvas) -{ subplugin_menu.set_name ("ArdourContextMenu"); - _view = new MidiStreamView (boost::dynamic_pointer_cast<MidiTimeAxisView> (shared_from_this ())); + _view = new MidiStreamView (*this); ignore_toggle = false; @@ -528,16 +510,13 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool assert(c); - boost::shared_ptr<AutomationTimeAxisView> track = - AutomationTimeAxisView::create ( - _session, + boost::shared_ptr<AutomationTimeAxisView> track(new AutomationTimeAxisView (_session, _route, boost::shared_ptr<ARDOUR::Automatable>(), c, _editor, - shared_from_this (), + *this, true, parent_canvas, - _route->describe_parameter(param) - ); + _route->describe_parameter(param))); add_automation_child(param, track, show); } |