X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsend_ui.cc;h=627fe531f68e0dbcf6fb21d2ca1ea0e41e3b2590;hb=5ef06dd439088226683beff5c6fc1d5af55a014b;hp=1014f5a07a9e977da1d060606016d3b91773eff4;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 1014f5a07a..627fe531f6 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,8 +19,10 @@
 
 #include <gtkmm2ext/doi.h>
 
+#include "ardour/amp.h"
 #include "ardour/io.h"
 #include "ardour/send.h"
+#include "ardour/rc_configuration.h"
 
 #include "utils.h"
 #include "send_ui.h"
@@ -28,48 +30,60 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
+SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session)
 	: _send (s)
-	, _session (se)
-	, gpm (se)
-	, panners (se)
+	, _gpm (session, 250)
+	, _panners (session)
 {
- 	panners.set_io (s->io());
- 	gpm.set_io (s->io());
+	assert (_send);
+
+ 	_panners.set_panner (s->panner_shell(), s->panner());
+ 	_gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
 
-	hbox.pack_start (gpm, true, true);
+	_hbox.pack_start (_gpm, true, true);
 	set_name ("SendUIFrame");
-	
-	vbox.set_spacing (5);
-	vbox.set_border_width (5);
 
-	vbox.pack_start (hbox, false, false, false);
-	vbox.pack_start (panners, false,false);
+	_vbox.set_spacing (5);
+	_vbox.set_border_width (5);
+
+	_vbox.pack_start (_hbox, false, false, false);
+	// until sends have their own Pannable, don't show this
+	// because it controls the Route Pannable which confuses
+	// users (among others)
+	// _vbox.pack_start (_panners, false, false);
+
+	io = manage (new IOSelector (parent, session, s->output()));
 
-	io = manage (new IOSelector (se, s->io(), true));
-	
-	pack_start (vbox, false, false);
+	pack_start (_vbox, false, false);
 
 	pack_start (*io, true, true);
 
-	show_all ();
+	io->show ();
+	_gpm.show_all ();
+	_panners.show_all ();
+	_vbox.show ();
+	_hbox.show ();
 
 	_send->set_metering (true);
 
-	_send->io()->input_changed.connect (mem_fun (*this, &SendUI::ins_changed));
-	_send->io()->output_changed.connect (mem_fun (*this, &SendUI::outs_changed));
-	
-	panners.set_width (Wide);
-	panners.setup_pan ();
+	_send->output()->changed.connect (connections, invalidator (*this), ui_bind (&SendUI::outs_changed, this, _1, _2), gui_context());
 
-	gpm.setup_meters ();
-	gpm.set_fader_name ("SendUIFrame");
+	_panners.set_width (Wide);
+	_panners.setup_pan ();
 
-	// screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &SendUI::update));
-	fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &SendUI::fast_update));
+	_gpm.setup_meters ();
+	_gpm.set_fader_name ("SendUIFrame");
+
+	// screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (
+	//		sigc::mem_fun (*this, &SendUI::update));
+	fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+			sigc::mem_fun (*this, &SendUI::fast_update));
 }
 
 SendUI::~SendUI ()
@@ -83,21 +97,12 @@ SendUI::~SendUI ()
 }
 
 void
-SendUI::ins_changed (IOChange change, void* ignored)
+SendUI::outs_changed (IOChange change, void* /*ignored*/)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUI::ins_changed), change, ignored));
-	if (change & ConfigurationChanged) {
-		panners.setup_pan ();
-	}
-}
-
-void
-SendUI::outs_changed (IOChange change, void* ignored)
-{
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUI::outs_changed), change, ignored));
-	if (change & ConfigurationChanged) {
-		panners.setup_pan ();
-		gpm.setup_meters ();
+	ENSURE_GUI_THREAD (*this, &SendUI::outs_changed, change, ignored)
+	if (change.type & IOChange::ConfigurationChanged) {
+		_panners.setup_pan ();
+		_gpm.setup_meters ();
 	}
 }
 
@@ -110,25 +115,29 @@ void
 SendUI::fast_update ()
 {
 	if (Config->get_meter_falloff() > 0.0f) {
-		gpm.update_meters ();
+		_gpm.update_meters ();
 	}
 }
-	
-SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
-	: ArdourDialog (string("Ardour: send ") + s->name())
+
+SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
+	: ArdourWindow (string (_("Send ")) + s->name())
 {
-	ui = new SendUI (s, ss);
+	ui = new SendUI (this, s, session);
 
 	hpacker.pack_start (*ui, true, true);
 
-	get_vbox()->set_border_width (5);
-	get_vbox()->pack_start (hpacker);
+	add (hpacker);
 
 	set_name ("SendUIWindow");
-	
-	going_away_connection = s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
 
-	signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+	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 ()
@@ -139,8 +148,8 @@ SendUIWindow::~SendUIWindow ()
 void
 SendUIWindow::send_going_away ()
 {
-	ENSURE_GUI_THREAD (mem_fun (*this, &SendUIWindow::send_going_away));
-	delete_when_idle (this);
+	ENSURE_GUI_THREAD (*this, &SendUIWindow::send_going_away)
 	going_away_connection.disconnect ();
+	delete_when_idle (this);
 }