diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-05-17 14:11:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-05-17 14:11:16 +0000 |
| commit | 6001b8d28dd764bada8b9198a5f91e0a2f5251f6 (patch) | |
| tree | fb8d3d95bcb78b5e16e14b6a8a8d2e05758cb98d /libs | |
| parent | 7a5eed3048ad5894302c53e4b9a56ca7abd2a03c (diff) | |
send control now has working metering, and switches back and forth between busses etc. correctly.
git-svn-id: svn://localhost/ardour2/branches/3.0@5092 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/route.h | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 10aec0446e..8de82bb219 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -181,7 +181,7 @@ class Route : public IO boost::shared_ptr<Delivery> control_outs() const { return _control_outs; } boost::shared_ptr<Delivery> main_outs() const { return _main_outs; } - boost::shared_ptr<IO> send_io_for (boost::shared_ptr<const IO> target) const; + boost::shared_ptr<Send> send_for (boost::shared_ptr<const IO> target) const; /** A record of the stream configuration at some point in the processor list. * Used to return where and why an processor list configuration request failed. diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 7fb063eae0..ccdd523654 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2683,8 +2683,8 @@ Route::set_name (const string& str) return ret; } -boost::shared_ptr<IO> -Route::send_io_for (boost::shared_ptr<const IO> target) const +boost::shared_ptr<Send> +Route::send_for (boost::shared_ptr<const IO> target) const { Glib::RWLock::ReaderLock lm (_processor_lock); @@ -2693,10 +2693,10 @@ Route::send_io_for (boost::shared_ptr<const IO> target) const if ((send = boost::dynamic_pointer_cast<Send>(*i)) != 0) { if (send->io()->connected_to (target)) { - return send->io(); + return send; } } } - return boost::shared_ptr<IO>(); + return boost::shared_ptr<Send>(); } |