diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 23:00:17 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 23:00:17 +0000 |
commit | b17dc03047f6edde97084d9a2ba4344dc0679c62 (patch) | |
tree | 2fc2815119f35f511cf93abd800c69f2236d7d1f /libs/ardour/delivery.cc | |
parent | d116af22db3c0e0cf6aeff6194a689d8bfad7c8c (diff) |
"Listen" delivery processors (i.e. monitor out) never get their own panner; Route calls Pannable::set_panner() so that it is always the panner for the main outs that controls the Route's own Pannable
git-svn-id: svn://localhost/ardour2/branches/3.0@8591 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 5c535b8918..fd32214446 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -364,6 +364,11 @@ Delivery::set_state (const XMLNode& node, int version) void Delivery::reset_panner () { + if (_role == Listen) { + /* monitor out gets no panner */ + return; + } + if (panners_legal) { if (!no_panner_reset) { @@ -395,9 +400,6 @@ Delivery::panners_became_legal () } _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets)); -#ifdef PANNER_HACKS - _panner->load (); // automation -#endif panner_legal_c.disconnect (); return 0; } |