diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/ardour/send.cc | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/send.cc')
| -rw-r--r-- | libs/ardour/send.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 33b4277d93..57c8500454 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -38,8 +38,8 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, Role r) - : Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r) +Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r) + : Delivery (s, p, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r) , _metering (false) { _amp.reset (new Amp (_session)); |