Fix addition of MIDI automation points (#3780).
authorCarl Hetherington <carl@carlh.net>
Thu, 17 Feb 2011 16:18:45 +0000 (16:18 +0000)
committerCarl Hetherington <carl@carlh.net>
Thu, 17 Feb 2011 16:18:45 +0000 (16:18 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@8885 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/automation_time_axis.cc
gtk2_ardour/midi_time_axis.cc

index 8f57fefe87037eceb1764aa2844d87193c82b389..a92ac3853077f70de8bb4cb3d261ed341557575b 100644 (file)
@@ -88,7 +88,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                have_name_font = true;
        }
 
-       if (_control) {
+       if (_automatable && _control) {
                _controller = AutomationController::create (_automatable, _control->parameter(), _control);
        }
 
index 77e862d8a90fb3f7663769a09c01b2195a39e6eb..2df561da3d8246961ad09edad05fe5cfb40f1a61 100644 (file)
@@ -846,7 +846,7 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
                        new AutomationTimeAxisView (
                                _session,
                                _route, 
-                               _route,
+                               boost::shared_ptr<Automatable> (),
                                boost::shared_ptr<AutomationControl> (),
                                param,
                                _editor,