X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Freturn_ui.cc;h=6edd57a28625b8f87562265305f3f67e0061fb30;hb=d7deaa21bb78222e25b820c9583942a47dbc8fac;hp=8a12a3ece9940450b9ce9d72f88d0e5014b026d2;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 8a12a3ece9..6edd57a286 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -30,6 +30,8 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
@@ -57,7 +59,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
 	show_all ();
 
 	_return->set_metering (true);
-	_return->input()->changed.connect (sigc::mem_fun (*this, &ReturnUI::ins_changed));
+	_return->input()->changed.connect (input_change_connection, invalidator (*this), ui_bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
 
 	_gpm.setup_meters ();
 	_gpm.set_fader_name ("ReturnUIFrame");
@@ -77,10 +79,10 @@ ReturnUI::~ReturnUI ()
 }
 
 void
-ReturnUI::ins_changed (IOChange change, void* ignored)
+ReturnUI::ins_changed (IOChange change, void* /*ignored*/)
 {
 	ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
-	if (change & ConfigurationChanged) {
+	if (change.type & IOChange::ConfigurationChanged) {
 		_gpm.setup_meters ();
 	}
 }
@@ -99,18 +101,17 @@ ReturnUI::fast_update ()
 }
 
 ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
-	: ArdourDialog (string("Ardour: return ") + r->name())
+	: ArdourWindow (string(_("Return ")) + r->name())
 {
 	ui = new ReturnUI (this, r, s);
 
 	hpacker.pack_start (*ui, true, true);
 
-	get_vbox()->set_border_width (5);
-	get_vbox()->pack_start (hpacker);
+	add (hpacker);
 
 	set_name ("ReturnUIWindow");
 
-	going_away_connection = r->GoingAway.connect (sigc::mem_fun (*this, &ReturnUIWindow::return_going_away));
+	r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
 	signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
 }
 
@@ -123,7 +124,7 @@ void
 ReturnUIWindow::return_going_away ()
 {
 	ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
-	going_away_connection.disconnect ();	
+	going_away_connection.disconnect ();
 	delete_when_idle (this);
 }