add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index fe1593a4aa941dd51c130e407387c969a52f088d..592fff0a0e6603a5e964a3734d8fb5402d0cf526 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -19,10 +19,9 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
-#include "ardour/return.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/return.h"
 
 #include "utils.h"
 #include "return_ui.h"
@@ -30,6 +29,8 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
@@ -57,7 +58,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        show_all ();
 
        _return->set_metering (true);
-       _return->input()->changed.connect (input_change_connection, boost::bind (&ReturnUI::ins_changed, this, _1, _2));
+       _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");
@@ -77,10 +78,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,19 +100,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");
 
-       r->GoingAway.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this));
-       signal_delete_event().connect (sigc::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());
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
@@ -123,7 +122,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);
 }