diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
| commit | e6eb059576eefd9a26c177627ae7dd3ba2feb727 (patch) | |
| tree | 536ce6ee456f2306bb0346a51ede0a4aa64a8e63 /gtk2_ardour/audio_time_axis.cc | |
| parent | 9bd274bfdee62c9cc0e5752d2a72027d2c732cd0 (diff) | |
the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 6ce54f7882..8f0c25bdb0 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -37,6 +37,7 @@ #include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/utils.h> +#include "ardour/amp.h" #include "ardour/audio_diskstream.h" #include "ardour/audioplaylist.h" #include "ardour/event_type_map.h" @@ -347,13 +348,14 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool return; } - boost::shared_ptr<AutomationTimeAxisView> gain_track(new AutomationTimeAxisView (_session, - _route, _route, c, - _editor, - *this, - false, - parent_canvas, - _route->describe_parameter(param))); + boost::shared_ptr<AutomationTimeAxisView> + gain_track(new AutomationTimeAxisView (_session, + _route, _route->amp(), c, + _editor, + *this, + false, + parent_canvas, + _route->amp()->describe_parameter(param))); add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); @@ -396,11 +398,11 @@ AudioTimeAxisView::ensure_pan_views (bool show) /* we don't already have an AutomationTimeAxisView for this parameter */ - std::string const name = _route->describe_parameter (pan_control->parameter ()); + std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); boost::shared_ptr<AutomationTimeAxisView> pan_track ( new AutomationTimeAxisView (_session, - _route, _route, pan_control, + _route, _route->panner(), pan_control, _editor, *this, false, |