diff options
author | Carl Hetherington <carl@carlh.net> | 2011-07-14 22:17:43 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-07-14 22:17:43 +0000 |
commit | 48de21b1201fdf828c32ab396ac75dc884a96d90 (patch) | |
tree | ac89601041c49a8f572668ede9883fe2ab0ca20e /libs/ardour/internal_send.cc | |
parent | a5efa9a500d2c1b592656e91e9ea7ef7d535dcb3 (diff) |
Move panner bypass state up to the PannerShell so that it is preserved even when new Panners are dropped in (refixes #4185).
git-svn-id: svn://localhost/ardour2/branches/3.0@9877 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/internal_send.cc')
-rw-r--r-- | libs/ardour/internal_send.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index 3dbc27f45a..171a5bb210 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -109,13 +109,7 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame assert(mixbufs.available() >= bufs.count()); - boost::shared_ptr<Panner> panner; - - if (_panshell) { - panner = _panshell->panner(); - } - - if (panner && !panner->bypassed()) { + if (_panshell && !_panshell->bypassed()) { mixbufs.set_count (_send_to->n_outputs ()); _panshell->run (bufs, mixbufs, start_frame, end_frame, nframes); } else { @@ -320,14 +314,8 @@ InternalSend::send_to_property_changed (const PropertyChange& what_changed) void InternalSend::set_can_pan (bool yn) { - boost::shared_ptr<Panner> panner; - if (_panshell) { - panner = _panshell->panner (); - } - - if (panner) { - panner->set_bypassed (!yn); + _panshell->set_bypassed (!yn); } } |