#include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/return.h"
+#include "ardour/rc_configuration.h"
#include "utils.h"
#include "return_ui.h"
#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)
+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());
_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);
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 ()
}
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 ();
}
}
}
}
-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);
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 ()
void
ReturnUIWindow::return_going_away ()
{
- ENSURE_GUI_THREAD (mem_fun (*this, &ReturnUIWindow::return_going_away));
- delete_when_idle (this);
+ ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
going_away_connection.disconnect ();
+ delete_when_idle (this);
}