diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
| commit | 79986643c0c904f6574bb5323e2233a43a9e622e (patch) | |
| tree | 859323dbb096ac1658359881e7d11415b6588caa /gtk2_ardour/redirect_automation_time_axis.cc | |
| parent | b0b723445816bc968a6a183c6619fccc61e82859 (diff) | |
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved
git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/redirect_automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/redirect_automation_time_axis.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/redirect_automation_time_axis.cc b/gtk2_ardour/redirect_automation_time_axis.cc index e3ce4b08c6..e527fd1d5e 100644 --- a/gtk2_ardour/redirect_automation_time_axis.cc +++ b/gtk2_ardour/redirect_automation_time_axis.cc @@ -33,7 +33,8 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; -RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n, +RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, + PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n, uint32_t prt, Redirect& rd, string state_name) : AxisView (s), |