summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_time_axis.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-07-03 02:37:24 +0000
committerDavid Robillard <d@drobilla.net>2007-07-03 02:37:24 +0000
commit0da29770276604a7f0a367cd8eb5ff2fff7a2233 (patch)
tree87f37c252457eab66c0806e097a2d147d8d66916 /gtk2_ardour/audio_time_axis.cc
parentef0b9a740996c432a6a96180814d4f8d0ee16842 (diff)
Pan automation/serialization fixes.
"Live" Midi CC sending from Midi CC automation track controllers. git-svn-id: svn://localhost/ardour2/trunk@2097 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_time_axis.cc')
-rw-r--r--gtk2_ardour/audio_time_axis.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index d032aaca9f..6e80c0b636 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -336,13 +336,20 @@ AudioTimeAxisView::update_pans ()
/* Man I hate that damn stereo->stereo panner */
uint32_t i = 0;
for (p = _route->panner().begin(); p != _route->panner().end(); ++p) {
+ boost::shared_ptr<AutomationControl> pan_control = (*p)->pan_control();
+
+ if (pan_control->list()->param_id().type() == NullAutomation) {
+ error << "Pan control has NULL automation type!" << endmsg;
+ continue;
+ }
+
boost::shared_ptr<AutomationTimeAxisView> pan_track(new AutomationTimeAxisView (_session,
- _route, _route/*FIXME*/, (*p)->pan_control(),
+ _route, _route/*FIXME*/, pan_control,
editor,
*this,
parent_canvas,
- _route->describe_parameter((*p)->pan_control()->list()->param_id()),
- ParamID(PanAutomation, i).to_string()/* FIXME: correct state name? */));
+ _route->describe_parameter(pan_control->list()->param_id()),
+ pan_control->list()->param_id().to_string()/* FIXME: correct state name? */));
add_automation_child(ParamID(PanAutomation, i), pan_track);
++i;
}