summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-02-17 16:18:45 +0000
committerCarl Hetherington <carl@carlh.net>2011-02-17 16:18:45 +0000
commit469b390e52eaea810b366eede2f9821a7ca238d1 (patch)
tree4fc82852052c9dd07efab0d20c0fc202a77bbd6e
parente2026160370d505009908c96ea1d49723225aa24 (diff)
Fix addition of MIDI automation points (#3780).
git-svn-id: svn://localhost/ardour2/branches/3.0@8885 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/automation_time_axis.cc2
-rw-r--r--gtk2_ardour/midi_time_axis.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 8f57fefe87..a92ac38530 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -88,7 +88,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
have_name_font = true;
}
- if (_control) {
+ if (_automatable && _control) {
_controller = AutomationController::create (_automatable, _control->parameter(), _control);
}
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 77e862d8a9..2df561da3d 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -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,