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/delivery.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/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 4a6b761f33..e7d435bacf 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -233,8 +233,6 @@ Delivery::configure_io (ChanCount in, ChanCount out) void Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required) { - boost::shared_ptr<Panner> panner; - assert (_output); PortSet& ports (_output->ports()); @@ -287,10 +285,6 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf Amp::apply_simple_gain (bufs, nframes, tgain); } - if (_panshell) { - panner = _panshell->panner(); - } - #if 0 if (_session.transport_rolling()) { cerr << name() << " first value written : " << scnt << endl; @@ -306,7 +300,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf } #endif - if (panner && !panner->bypassed()) { + if (_panshell && !_panshell->bypassed()) { // Use the panner to distribute audio to output port buffers @@ -350,7 +344,7 @@ Delivery::state (bool full_state) node.add_property("role", enum_2_string(_role)); if (_panshell) { - node.add_child_nocopy (_panshell->state (full_state)); + node.add_child_nocopy (_panshell->get_state ()); } return node; |