diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-01 15:09:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-01 15:09:28 +0000 |
| commit | 07cadd6fcaf6148f152a837f715b3e734eadb443 (patch) | |
| tree | 00aeea1bc9e66763d2f8b77124da3622296634ee /libs/ardour/delivery.cc | |
| parent | 953c5b575dce63bf58565766b69caa4c2c217801 (diff) | |
ensure that the main outs' panner <-> pannable relationship is setup in a new session
git-svn-id: svn://localhost/ardour2/branches/3.0@8641 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index ee695afe64..56057ca7cc 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -24,6 +24,7 @@ #include "ardour/midi_buffer.h" +#include "ardour/debug.h" #include "ardour/delivery.h" #include "ardour/audio_buffer.h" #include "ardour/amp.h" @@ -97,6 +98,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha Delivery::~Delivery() { + DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name)); delete _output_buffers; } @@ -307,8 +309,6 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) { _output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset); } - - } out: @@ -382,9 +382,11 @@ Delivery::reset_panner () _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); + if (_role == Main) { + _panshell->pannable()->set_panner (_panshell->panner()); + } } - } else { panner_legal_c.disconnect (); PannersLegal.connect_same_thread (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this)); |