update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 7bd9ca955738eb9b7a5b511a452a5ce1cf57bfc7..d279aa55f4f7cf84a53ae82375805d049e78522f 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -30,14 +30,15 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& se)
-       : _return (r)
-       , _session (se)
-       , _gpm (se, 250)
+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());
 
@@ -49,7 +50,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s
 
        _vbox.pack_start (_hbox, false, false, false);
 
-       io = manage (new IOSelector (parent, se, r->output()));
+       io = manage (new IOSelector (parent, session, r->output()));
 
        pack_start (_vbox, false, false);
 
@@ -58,13 +59,13 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s
        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), ui_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));
+       // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::update));
+       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
 }
 
 ReturnUI::~ReturnUI ()
@@ -78,10 +79,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 ();
        }
 }
@@ -99,10 +100,10 @@ ReturnUI::fast_update ()
        }
 }
 
-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)
+       : ArdourDialog (string(_("Return ")) + r->name())
 {
-       ui = new ReturnUI (this, s, ss);
+       ui = new ReturnUI (this, r, s);
 
        hpacker.pack_start (*ui, true, true);
 
@@ -111,8 +112,8 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss)
 
        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)));
+       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)));
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
@@ -123,8 +124,8 @@ ReturnUIWindow::~ReturnUIWindow ()
 void
 ReturnUIWindow::return_going_away ()
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &ReturnUIWindow::return_going_away));
+       ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
+       going_away_connection.disconnect ();    
        delete_when_idle (this);
-       going_away_connection.disconnect ();
 }