X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fsend_ui.cc;h=d571d018b73a705ef3d74fa7b77b22ebfa4c5a3d;hb=18efe8f446f45b541f19a2f99dd707f66fb72a3e;hp=a000bfcaa952a98a3ec7ca047c4394f88b3f52c6;hpb=05283a63398fd7a563480a76802e6b2c2ad2e404;p=ardour.git

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index a000bfcaa9..d571d018b7 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -19,12 +19,11 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.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"
@@ -47,7 +46,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
  	_gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
 
 	_hbox.pack_start (_gpm, true, true);
-	set_name ("SendUIFrame");
+	set_name (X_("SendUIFrame"));
 
 	_vbox.set_spacing (5);
 	_vbox.set_border_width (5);
@@ -55,7 +54,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
 	_vbox.pack_start (_hbox, false, false, false);
 	_vbox.pack_start (_panners, false, false);
 
-	io = manage (new IOSelector (parent, session, s->output()));
+	io = Gtk::manage (new IOSelector (parent, session, s->output()));
 
 	pack_start (_vbox, false, false);
 
@@ -69,13 +68,17 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
 
 	_send->set_metering (true);
 
-	_send->output()->changed.connect (connections, invalidator (*this), ui_bind (&SendUI::outs_changed, this, _1, _2), gui_context());
+	_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 ();
-	_gpm.set_fader_name ("SendUIFrame");
+	_gpm.set_fader_name (X_("SendUIFader"));
 
 	// screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (
 	//		sigc::mem_fun (*this, &SendUI::update));
@@ -98,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 ();
 	}
 }
@@ -111,6 +121,10 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
+	if (!is_mapped()) {
+		return;
+	}
+
 	if (Config->get_meter_falloff() > 0.0f) {
 		_gpm.update_meters ();
 	}
@@ -130,23 +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());
-
-	signal_delete_event().connect (sigc::bind (
-					       sigc::ptr_fun (just_hide_it),
-					       reinterpret_cast<Window *> (this)));
 }
 
 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);
-}
-