move point at which main outs Panner <-> Route Pannable binding occurs, so that it...

git-svn-id: svn://localhost/ardour2/branches/3.0@8596 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index fd32214446e4c0e70e8c8ffc8ed748bf84a2a6f1..ee695afe648849ac423ec0950de631c3f222c694 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -381,7 +381,10 @@ Delivery::reset_panner ()
                        }
 
                        _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+
                }
+
+
        } else {
                panner_legal_c.disconnect ();
                PannersLegal.connect_same_thread (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this));
@@ -400,6 +403,11 @@ Delivery::panners_became_legal ()
        }
 
        _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
+
+        if (_role == Main) {
+                _panshell->pannable()->set_panner (_panshell->panner());
+        }
+
        panner_legal_c.disconnect ();
        return 0;
 }

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 016c72b8a727e30e458d53e50507a522e7fb2a3b..b732fd09e8b6c08cff0b59fbfd6b0fff85d62782 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1602,13 +1602,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
                _meter->reset_max_channels (processor_max_streams);
        }
 
-        /* if we haven't bound the main outs panner & our pannable together yet, do it now ..
-         */
-
-        if (_main_outs && !_pannable->panner()) {
-                _pannable->set_panner (_main_outs->panner_shell()->panner());
-        }
-
        /* make sure we have sufficient scratch buffers to cope with the new processor
           configuration */
        _session.ensure_buffers (n_process_buffers ());