X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsend_ui.cc;h=7cf8228ffe551a8bbc4ab0ee9bbf621c45d6b577;hb=cb8bc87a542e35794a12e76a23594e63b3bad521;hp=9925ff51d4331caf405f79a8ab3cf2d751d445dd;hpb=8277d134b9733aee344782891c99f07114384d9e;p=ardour.git

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 9925ff51d4..7cf8228ffe 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
@@ -15,63 +15,78 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <ardour/send.h>
 #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"
 #include "io_selector.h"
 #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)
-	: _send (s),
-	  _session (se),
-	  gpm (s, se),
-	  panners (s, se)
+SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session)
+	: _send (s)
+	, _gpm (session, 250)
+	, _panners (session)
 {
-	hbox.pack_start (gpm, true, true);
+	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);
 	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);
+	_vbox.pack_start (_panners, false, false);
 
-	io = new IOSelector (se, s, false);
-	
-	pack_start (vbox, false, false);
+	io = manage (new IOSelector (parent, session, s->output()));
+
+	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->output_changed.connect (mem_fun (*this, &SendUI::ins_changed));
-	_send->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());
+
+	_panners.set_width (Wide);
+	_panners.setup_pan ();
 
-	gpm.setup_meters ();
-	gpm.set_fader_name ("SendUIFrame");
+	_gpm.setup_meters ();
+	_gpm.set_fader_name ("SendUIFrame");
 
-	// 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));
+	// 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 ()
 {
 	_send->set_metering (false);
-	
+
 	/* XXX not clear that we need to do this */
 
 	screen_update_connection.disconnect();
@@ -79,32 +94,15 @@ SendUI::~SendUI ()
 }
 
 void
-SendUI::ins_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)
+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 ();
 	}
 }
 
-void
-SendUI::send_going_away (Redirect *ignored)
-{
-	ENSURE_GUI_THREAD (bind (mem_fun (*this, &SendUI::send_going_away), ignored));
-
-	delete this;
-}
-
 void
 SendUI::update ()
 {
@@ -113,28 +111,31 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
-	if (_session.meter_falloff() > 0.0f) {
-		gpm.update_meters ();
+	if (Config->get_meter_falloff() > 0.0f) {
+		_gpm.update_meters ();
 	}
 }
-	
-SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
-{
-	ui = new SendUI (s, ss);
 
-	vpacker.set_border_width (5);
+SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
+	: ArdourDialog (string (_("Send ")) + s->name())
+{
+	ui = new SendUI (this, s, session);
 
 	hpacker.pack_start (*ui, true, true);
 
-	vpacker.pack_start (hpacker);
+	get_vbox()->set_border_width (5);
+	get_vbox()->pack_start (hpacker);
 
-	add (vpacker);
 	set_name ("SendUIWindow");
 
-	s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
+	ui->show ();
+	hpacker.show ();
 
-	signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+	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 ()
@@ -143,10 +144,10 @@ SendUIWindow::~SendUIWindow ()
 }
 
 void
-SendUIWindow::send_going_away (Redirect *ignored)
+SendUIWindow::send_going_away ()
 {
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUIWindow::send_going_away), ignored));
-	
-	delete this;
+	ENSURE_GUI_THREAD (*this, &SendUIWindow::send_going_away)
+	going_away_connection.disconnect ();
+	delete_when_idle (this);
 }