X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Freturn_ui.cc;h=a6b27f7af7eef67a509e97bbd814ec071e80f37c;hb=7e3a970c1eb964a18e645adcc2e908c0d1b18460;hp=155a1095c1ef4b9c5be6ca1ad92f826e6cc2dde2;hpb=e6eb059576eefd9a26c177627ae7dd3ba2feb727;p=ardour.git

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 155a1095c1..a6b27f7af7 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_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,37 +19,37 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/return.h"
 
-#include "utils.h"
 #include "return_ui.h"
 #include "io_selector.h"
-#include "ardour_ui.h"
 #include "gui_thread.h"
+#include "timers.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-ReturnUI::ReturnUI (boost::shared_ptr<Return> r, Session& se)
-	: _return (r)
-	, _session (se)
-	, _gpm (se)
+ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* session)
+	:_return (r)
+	, _gpm (session, 250)
 {
- 	_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp()->gain_control(), r->amp());
+	_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp(), r->gain_control());
 
 	_hbox.pack_start (_gpm, true, true);
-	set_name ("ReturnUIFrame");
-	
+	set_name (X_("ReturnUIFrame"));
+
 	_vbox.set_spacing (5);
 	_vbox.set_border_width (5);
 
 	_vbox.pack_start (_hbox, false, false, false);
 
-	io = manage (new IOSelector (se, r->output()));
-	
+	io = Gtk::manage (new IOSelector (parent, session, r->output()));
+
 	pack_start (_vbox, false, false);
 
 	pack_start (*io, true, true);
@@ -57,13 +57,13 @@ ReturnUI::ReturnUI (boost::shared_ptr<Return> r, Session& se)
 	show_all ();
 
 	_return->set_metering (true);
-	_return->input()->changed.connect (mem_fun (*this, &ReturnUI::ins_changed));
-	
+	_return->input()->changed.connect (input_change_connection, invalidator (*this), boost::bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
+
 	_gpm.setup_meters ();
-	_gpm.set_fader_name ("ReturnUIFrame");
-	
-	// screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::update));
-	fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::fast_update));
+	_gpm.set_fader_name (X_("ReturnUIFader"));
+
+	// screen_update_connection = Timers::rapid_connect (sigc::mem_fun (*this, &ReturnUI::update));
+	fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
 }
 
 ReturnUI::~ReturnUI ()
@@ -77,10 +77,10 @@ ReturnUI::~ReturnUI ()
 }
 
 void
-ReturnUI::ins_changed (IOChange change, void* ignored)
+ReturnUI::ins_changed (IOChange change, void* /*ignored*/)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &ReturnUI::ins_changed), change, ignored));
-	if (change & ConfigurationChanged) {
+	ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
+	if (change.type & IOChange::ConfigurationChanged) {
 		_gpm.setup_meters ();
 	}
 }
@@ -97,33 +97,21 @@ ReturnUI::fast_update ()
 		_gpm.update_meters ();
 	}
 }
-	
-ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss)
-	: ArdourDialog (string("Ardour: return ") + s->name())
+
+ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
+	: ArdourWindow (string(_("Return ")) + r->name())
 {
-	ui = new ReturnUI (s, ss);
+	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 = s->GoingAway.connect (mem_fun (*this, &ReturnUIWindow::return_going_away));
-	signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
 {
 	delete ui;
 }
-
-void
-ReturnUIWindow::return_going_away ()
-{
-	ENSURE_GUI_THREAD (mem_fun (*this, &ReturnUIWindow::return_going_away));
-	delete_when_idle (this);
-	going_away_connection.disconnect ();
-}
-