#include "ardour_ui.h"
#include "gui_thread.h"
+#include "i18n.h"
+
using namespace std;
using namespace ARDOUR;
using namespace PBD;
show_all ();
_return->set_metering (true);
- _return->input()->changed.connect (input_change_connection, ui_bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
+ _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");
}
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 ();
}
}
}
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
- : ArdourDialog (string("Ardour: return ") + r->name())
+ : ArdourDialog (string(_("Return ")) + r->name())
{
ui = new ReturnUI (this, r, s);
set_name ("ReturnUIWindow");
- r->DropReferences.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
+ 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::return_going_away ()
{
ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
- going_away_connection.disconnect ();
+ going_away_connection.disconnect ();
delete_when_idle (this);
}