X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsend_ui.cc;h=d571d018b73a705ef3d74fa7b77b22ebfa4c5a3d;hb=0b1ee476edaed41f4c679f89e93a486e4d487333;hp=5b7bd10750102c4404a3c1a02570a480e73bb0b6;hpb=113f28b6fe459689f904c8acbc084e4d2a57ce63;p=ardour.git

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 5b7bd10750..d571d018b7 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -20,10 +20,10 @@
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/io.h"
+#include "ardour/panner_manager.h"
 #include "ardour/send.h"
 #include "ardour/rc_configuration.h"
 
-#include "utils.h"
 #include "send_ui.h"
 #include "io_selector.h"
 #include "ardour_ui.h"
@@ -70,7 +70,11 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
 
 	_send->output()->changed.connect (connections, invalidator (*this), boost::bind (&SendUI::outs_changed, this, _1, _2), gui_context());
 
+	uint32_t const in = _send->pans_required();
+	uint32_t const out = _send->pan_outs();
+
 	_panners.set_width (Wide);
+	_panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
 	_panners.setup_pan ();
 
 	_gpm.setup_meters ();
@@ -97,7 +101,14 @@ SendUI::outs_changed (IOChange change, void* /*ignored*/)
 {
 	ENSURE_GUI_THREAD (*this, &SendUI::outs_changed, change, ignored)
 	if (change.type & IOChange::ConfigurationChanged) {
+		uint32_t const in = _send->pans_required();
+		uint32_t const out = _send->pan_outs();
+		if (_panners._panner == 0) {
+			_panners.set_panner (_send->panner_shell(), _send->panner());
+		}
+		_panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
 		_panners.setup_pan ();
+		_panners.show_all ();
 		_gpm.setup_meters ();
 	}
 }
@@ -133,19 +144,9 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
 	ui->show ();
 	hpacker.show ();
 
-	s->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&SendUIWindow::send_going_away, this), gui_context());
 }
 
 SendUIWindow::~SendUIWindow ()
 {
 	delete ui;
 }
-
-void
-SendUIWindow::send_going_away ()
-{
-	ENSURE_GUI_THREAD (*this, &SendUIWindow::send_going_away)
-	going_away_connection.disconnect ();
-	delete_when_idle (this);
-}
-