#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 "i18n.h"
:_return (r)
, _gpm (session, 250)
{
- _gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
+ _gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp(), r->gain_control());
_hbox.pack_start (_gpm, true, true);
set_name (X_("ReturnUIFrame"));
_gpm.setup_meters ();
_gpm.set_fader_name (X_("ReturnUIFader"));
- // 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));
+ // 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 ()
set_name ("ReturnUIWindow");
- r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
}
ReturnUIWindow::~ReturnUIWindow ()
{
delete ui;
}
-
-void
-ReturnUIWindow::return_going_away ()
-{
- ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
- going_away_connection.disconnect ();
- delete_when_idle (this);
-}
-